diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-04-16 21:34:44 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-04-16 21:34:44 +0000 |
| commit | 7b3b6ed3f94dd69f369124512f0357019f23cf73 (patch) | |
| tree | c0cff6ccdfd19be0b9370b2d0c79a16c15270a27 /Makefile.nmake | |
| parent | c08d3013deecee62055dae9598263ec543deece5 (diff) | |
Check for the existence of a couple of directories and add variables for DLL
names.
svn path=/trunk/; revision=28070
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 0c0b725684..f4236055ec 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -997,8 +997,8 @@ install-all: install-generated-files # if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR) # if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules xcopy $(GTK_DIR)\etc\gtk-2.0\*.* $(INSTALL_DIR)\etc\gtk-2.0 /d - xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d - xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d + if exist $(GTK_DIR)\etc\pango xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d + if exist $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d xcopy $(GTK_DIR)\lib\gtk-2.0\modules\libgail.dll $(INSTALL_DIR)\lib\gtk-2.0\modules /d xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines /d # xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d @@ -1008,10 +1008,10 @@ install-all: install-generated-files xcopy $(GTK_DIR)\bin\libpng12-0.dll $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_LIBTIFF_DLL - xcopy $(GTK_DIR)\bin\libtiff3.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(TIFF_DLL) $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_LIBJPEG_DLL - xcopy $(GTK_DIR)\bin\jpeg62.dll $(INSTALL_DIR) /d + xcopy $(GTK_DIR)\bin\$(JPEG_DLL) $(INSTALL_DIR) /d !ENDIF !IFDEF NEED_CAIRO_DLL xcopy $(GTK_DIR)\bin\libcairo-2.dll $(INSTALL_DIR) /d @@ -1028,7 +1028,7 @@ install-all: install-generated-files !IFDEF ICONV_DIR xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d !ENDIF - xcopy $(GETTEXT_DIR)\bin\intl.dll $(INSTALL_DIR) /d + xcopy $(GETTEXT_DIR)\bin\$(GETTEXT_DLL) $(INSTALL_DIR) /d !IFDEF ZLIB_DIR xcopy $(ZLIB_DLL) $(INSTALL_DIR) /d !ENDIF |