diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-11-13 04:06:32 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-11-13 04:06:32 +0000 |
commit | c72e9212c52f96f2a799df625fa63e62cd31f3d8 (patch) | |
tree | 690ac1f791e9c29371bda4e30691473c286dc6e0 /buildtools/configure.pl | |
parent | 92c27757b331eceb9a989dce378cd6d2738d9ed0 (diff) | |
download | netpbm-mirror-c72e9212c52f96f2a799df625fa63e62cd31f3d8.tar.gz netpbm-mirror-c72e9212c52f96f2a799df625fa63e62cd31f3d8.tar.xz netpbm-mirror-c72e9212c52f96f2a799df625fa63e62cd31f3d8.zip |
Fix Darwin build/install
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@122 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'buildtools/configure.pl')
-rwxr-xr-x | buildtools/configure.pl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index dea30b75..4fe9326a 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -611,10 +611,12 @@ sub libSuffix($) { #----------------------------------------------------------------------------- my $suffix; - if ($platform eq "windows") { - $suffix = ".a"; + if ($platform eq 'windows') { + $suffix = '.a'; + } elsif ($platform= 'darwin') { + $suffix = '.dylib'; } else { - $suffix = ".so"; + $suffix = '.so'; } } @@ -1028,6 +1030,8 @@ sub getX11Library($@) { $default = '/usr/link/X11/libX11' . libSuffix($platform); } elsif (-d('/usr/lib/X11')) { $default = '/usr/lib/libX11' . libSuffix($platform); + } elsif (-d('/usr/X11R6')) { + $default = '/usr/X11R6/lib/libX11' . libSuffix($platform); } else { $default = "libX11" . libSuffix($platform); } @@ -2025,7 +2029,7 @@ if ($platform eq "GNU") { push(@Makefile_config, 'CFLAGS_SHLIB = -fno-common', "\n"); push(@Makefile_config, "LDSHLIB = ", "-dynamiclib ", - '-install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib', + '-install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib', "\n"); # push(@Makefile_config, "INSTALL = install\n"); } else { |