make everything support installdir

git-svn-id: svn://svn.icculus.org/netradiant/trunk@157 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-01-07 14:00:29 +00:00
parent 5703b5a6ea
commit d0d88d3503
2 changed files with 6 additions and 5 deletions

View File

@ -926,7 +926,7 @@ install-data: binaries
.PHONY: install-dll .PHONY: install-dll
ifeq ($(OS),Win32) ifeq ($(OS),Win32)
install-dll: binaries 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 else
install-dll: binaries install-dll: binaries
@$(ECHO) No DLL inclusion implemented for this target. @$(ECHO) No DLL inclusion implemented for this target.

View File

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