From 65244bc22c20edfbf727f5bf2a5855c5eca2e23a Mon Sep 17 00:00:00 2001
From: cebix <>
Date: Sun, 3 Oct 1999 17:45:08 +0000
Subject: [PATCH] - sys_unix.cpp: changed one #ifdef that should really have
 been an #if - Makefile.in: provided uninstall target

---
 BasiliskII/src/Unix/Makefile.in  | 9 +++++++--
 BasiliskII/src/Unix/sys_unix.cpp | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index c93158ab..1c727abb 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -8,7 +8,6 @@ exec_prefix=@exec_prefix@
 bindir=$(exec_prefix)/bin
 sharedir=$(prefix)/share/BasiliskII
 mandir=$(prefix)/man
-docdir=$(prefix)/doc/BasiliskII
 
 CC = @CC@
 CXX = @CXX@
@@ -61,7 +60,13 @@ modules:
 install: $(APP)
 	$(INSTALL_PROGRAM) BasiliskII $(bindir)/
 	$(INSTALL_DATA) BasiliskII.1 $(mandir)/man1/
-	$(INSTALL_DATA) keycodes $(sharedir)/
+	$(INSTALL) -d $(sharedir)
+	$(INSTALL_DATA) keycodes $(sharedir)
+
+uninstall:
+	-rm -f $(bindir)/BasiliskII
+	-rm -f $(mandir)/man1/BasiliskII.1
+	-rm -rf $(sharedir)
 
 clean:
 	-rm -f $(OBJ_DIR)/* core* *.core *~ *.bak
diff --git a/BasiliskII/src/Unix/sys_unix.cpp b/BasiliskII/src/Unix/sys_unix.cpp
index 74c18063..9f7a51da 100644
--- a/BasiliskII/src/Unix/sys_unix.cpp
+++ b/BasiliskII/src/Unix/sys_unix.cpp
@@ -581,7 +581,7 @@ void SysAllowRemoval(void *arg)
 	if (!fh)
 		return;
 
-#ifdef defined(__linux__) && defined(CDROM_LOCKDOOR)
+#if defined(__linux__) && defined(CDROM_LOCKDOOR)
 	if (fh->is_cdrom)
 		ioctl(fh->fd, CDROM_LOCKDOOR, 0);	
 #endif