make everything support installdir

git-svn-id: svn://svn.icculus.org/netradiant/trunk@157 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/Makefile b/Makefile
index e1d1fbd7f05bfa2eec88bb6a5e3ca055da1f6404..3c68356ce7f30b3910e83b82a2a8089499ee3852 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -926,7 +926,7 @@ install-data: binaries
 .PHONY: install-dll
 ifeq ($(OS),Win32)
 install-dll: binaries
-       MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" $(SH) install-dlls.sh
+       MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh
 else
 install-dll: binaries
        @$(ECHO) No DLL inclusion implemented for this target.

diff --git a/install-dlls.sh b/install-dlls.sh
index 1ecbca6af6947f58504a38df77e4336c3217c6b2..d6fb970e54f3fd75798fed22630e7479fc2f7920 100644 (file)
--- a/install-dlls.sh
+++ b/install-dlls.sh
@@ -7,6 +7,7 @@ set -ex
 : ${CP:=cp}
 : ${CAT:=cat}
 : ${MKDIR:=mkdir -p}
+: ${INSTALLDIR:=.}
 
 for DLL in \
        intl.dll \
@@ -27,12 +28,12 @@ for DLL in \
        libxml2-2.dll \
        zlib1.dll \
 ; do
-       $CP "`$WHICHDLL $DLL`" install/
+       $CP "`$WHICHDLL $DLL`" $INSTALLDIR/
 done
 
-$CP "$GTKDIR/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" install/libgdk-win32-2.0-0-pixbufloader-bmp.dll
-$MKDIR install/etc/gtk-2.0
-$CAT > install/etc/gtk-2.0/gdk-pixbuf.loaders <<'EOF'
+$CP "$GTKDIR/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll" $INSTALLDIR/libgdk-win32-2.0-0-pixbufloader-bmp.dll
+$MKDIR $INSTALLDIR/etc/gtk-2.0
+$CAT > $INSTALLDIR/etc/gtk-2.0/gdk-pixbuf.loaders <<'EOF'
 # GdkPixbuf Image Loader Modules file
 #
 #