--- pdftk/Makefile.OSX-10.6.orig 2010-09-30 15:41:52.000000000 -0500 +++ pdftk/Makefile.OSX-10.6 2010-10-13 05:29:58.000000000 -0500 @@ -28,13 +28,13 @@ # tools # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME) -TOOLPATH=/sw/lib/gcc4.5/bin/ +TOOLPATH=@PREFIX@/bin/ export VERSUFF=-fsf-4.5 export CXX= $(TOOLPATH)g++$(VERSUFF) export GCJ= $(TOOLPATH)gcj$(VERSUFF) export GCJH= $(TOOLPATH)gcjh$(VERSUFF) export GJAR= $(TOOLPATH)gjar$(VERSUFF) -export LIBGCJ= /sw/lib/gcc4.5/share/java/libgcj-4.5.0.jar +export LIBGCJ= @PREFIX@/share/java/libgcj-$(shell $(GCJ) -dumpversion).jar export AR= ar export RM= rm export ARFLAGS= rs @@ -71,11 +71,10 @@ # only effects libraries following option on the command line # # -export MACOSX_DEPLOYMENT_TARGET= 10.4 -export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -mmacosx-version-min=10.4 +export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers export CXXFLAGS= -Wall -Wextra -Weffc++ -O2 export GCJFLAGS= -Wall -fsource=1.3 -O2 export GCJHFLAGS= -force -export LDLIBS= /sw/lib/gcc4.5/lib/libgcj.dylib /sw/lib/gcc4.5/lib/libstdc++.dylib /sw/lib/gcc4.5/lib/libgcc_s.1.dylib -liconv -lz +export LDLIBS= $(shell $(CXX) -print-file-name=libgcj.dylib) $(shell $(CXX) -print-file-name=libstdc++.dylib) $(shell $(CXX) -print-file-name=libgcc_s.1.dylib) -liconv -lz include Makefile.Base