Install to relative location and look for the sound server in the right place.

Lubomir Rintel <lkundrak@v3.sk>

--- koules1.4/Imakefile.imake	2007-10-28 02:59:43.000000000 +0100
+++ koules1.4/Imakefile	2007-10-28 03:01:57.000000000 +0100
@@ -56,7 +56,7 @@
 
 DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\
 	$(NAMEDEF) $(ASMDEF)\
-	-DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \
+	-DSOUNDSERVER=\"$(LIBEXECDIR)/$(SOUNDSERVER)\" \
 	-DSOUNDDIR=\"$(SOUNDDIR)\" \
 	-DSOUNDDEV=\"$(SOUNDDEV)\"
 #endif
@@ -84,7 +84,6 @@
 all::xkoules
 #endif
 
-BINDIR = $(KOULESDIR)
 DESTDIR = /
 
 ComplexProgramTargetNoMan(xkoules)
@@ -95,26 +94,26 @@
 #endif
 #ifdef NAS_SOUND
 install:: $(PROGRAMS) $(SOUNDSERVER)
-	@echo "Koules directory is " $(KOULESDIR)
+	@echo "Koules directory is " $(BINDIR)
 	@:
 	@echo "Instalin man page to " $(MANDIR)
-	@mkdirhier $(MANDIR)
-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
+	@mkdirhier $(DESTDIR)$(MANDIR)
+	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
 	@:
-	@echo "Creating directory " $(KOULESDIR)
-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
+	@echo "Creating directory " $(BINDIR)
+	@if [ ! -d $(DESTDIR)$(BINDIR) ]; then mkdirhier $(DESTDIR)$(BINDIR); fi
 	@:
 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
 	 then								\
 		echo "Creating directory " $(SOUNDDIR); 		\
-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
+		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
 		echo "Copying sound server to directory " $(SOUNDDIR); \
-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
+		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(LIBEXECDIR); \
 		echo "Copying sound files into directory " $(SOUNDDIR); \
 		cd ./sounds; set -x;					\
 		for file in *.raw; do                                   \
 		    auconvert -raw linu8 1 -rate 8000 -volume 40 $$file -file snd `basename $$file .raw`.au ; \
-		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(SOUNDDIR); \
+		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(DESTDIR)$(SOUNDDIR); \
 		done;                                                   \
 	 fi
 	@echo
@@ -123,26 +122,26 @@
 #else
 #ifdef RSOUND
 install:: $(PROGRAMS) $(SOUNDSERVER)
-	@echo "Koules directory is " $(KOULESDIR)
+	@echo "Koules directory is " $(BINDIR)
 	@:
 	@echo "Instalin man page to " $(MANDIR)
-	@mkdirhier $(MANDIR)
-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
+	@mkdirhier $(DESTDIR)$(MANDIR)
+	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
 	@:
-	@echo "Creating directory " $(KOULESDIR)
-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
+	@echo "Creating directory " $(BINDIR)
+	@if [ ! -d $(DESTDIR)$(BINDIR) ]; then mkdirhier $(DESTDIR)$(BINDIR); fi
 	@:
 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
 	 then								\
 		echo "Creating directory " $(SOUNDDIR); 		\
-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
+		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
 		echo "Copying sound server to directory " $(SOUNDDIR); \
-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
+		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(LIBEXECDIR); \
 		echo "Copying sound files into directory " $(SOUNDDIR); \
 		cd ./sounds; set -x;					\
 		for file in *.raw; do                                   \
 		    sh ../myauconvert $$file `basename $$file .raw`.au ; \
-		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(SOUNDDIR); \
+		    $(INSTALL) -c $(INSTDATFLAGS) `basename $$file .raw`.au $(DESTDIR)$(SOUNDDIR); \
 		done;                                                   \
 	 fi
 	@echo
@@ -153,25 +152,25 @@
 	@echo
 #else
 install:: $(PROGRAMS) $(SOUNDSERVER)
-	@echo "Koules directory is " $(KOULESDIR)
+	@echo "Koules directory is " $(BINDIR)
 	@:
 	@echo "Instalin man page to " $(MANDIR)
-	@mkdirhier $(MANDIR)
-	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR);
+	@mkdirhier $(DESTDIR)$(MANDIR)
+	$(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(DESTDIR)$(MANDIR);
 	@:
-	@echo "Creating directory " $(KOULESDIR)
-	@if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi
+	@echo "Creating directory " $(BINDIR)
+	@if [ ! -d $(DESTDIR)$(BINDIR) ]; then mkdirhier $(DESTDIR)$(BINDIR); fi
 	@:
 	@if [ "$(INSTALLSOUND)" = "True" ]; 				\
 	 then								\
 		echo "Creating directory " $(SOUNDDIR); 		\
-		if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi;    \
+		if [ ! -d $(DESTDIR)$(SOUNDDIR) ]; then mkdirhier $(DESTDIR)$(SOUNDDIR); fi;    \
 		echo "Copying sound server to directory " $(SOUNDDIR); \
-		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \
+		$(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(DESTDIR)$(LIBEXECDIR); \
 		echo "Copying sound files into directory " $(SOUNDDIR); \
 		cd ./sounds; set -x;					\
 		for file in *.raw; do					\
-		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(SOUNDDIR);	\
+		    $(INSTALL) -c $(INSTDATFLAGS) $$file $(DESTDIR)$(SOUNDDIR);	\
 		done;   						\
 	 fi
 	@echo