make everything support installdir
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 7 Jan 2009 14:00:29 +0000 (14:00 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Wed, 7 Jan 2009 14:00:29 +0000 (14:00 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@157 61c419a2-8eb2-4b30-bcec-8cead039b335

Makefile
install-dlls.sh

index e1d1fbd..3c68356 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.
index 1ecbca6..d6fb970 100644 (file)
@@ -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
 #
 #