Ticket #65527: patch-csl-build.diff

cslbase/configure.ac

@@ -473 +473 @@
   then
     CPPFLAGS="$CPPFLAGS -I$HOME/ports/include -I$HOME/ports/include/freetype2"
   fi
-  if test -d /opt/local/include
+  if test -d @PREFIX@/include
   then
-    CPPFLAGS="$CPPFLAGS -I/opt/local/include -I/opt/local/include/freetype2"
+    CPPFLAGS="$CPPFLAGS -I@PREFIX@/include -I@PREFIX@/include/freetype2"
   fi
   XLIBS="-lXext -lX11 -lXft -lfontconfig -lc"
   macintosh_build="yes"
@@ -502 +502 @@
     then
       LDFLAGS="$LDFLAGS -L$HOME/ports/lib"
     fi
-    if test -d /opt/local/lib
+    if test -d @PREFIX@/lib
     then
-      LDFLAGS="$LDFLAGS -L/opt/local/lib"
+      LDFLAGS="$LDFLAGS -L@PREFIX@/lib"
     fi
     LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/X11/lib"
     LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
@@ -1225 +1225 @@
 # libraries are nevertheless available. I will look for freetype-config
 # which may also help me...
         AC_PATH_PROGS(FREETYPE_CONFIG, freetype-config, [no],
-          [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:/opt/local/bin:$PATH])
+          [/usr/local/bin:/usr/sfw/bin:$HOME/ports/bin:@PREFIX@/bin:$PATH])
         if test "$FREETYPE_CONFIG" != "no"
         then
 # I will add to CFLAGS and XLIBS if freetype-config is found, an in fact I
@@ -1722 +1722 @@
 # configured for use without a GUI.
   if test "$with_gui" = "yes"
   then
-    if test -d /opt/local/lib
+    if test -d @PREFIX@/lib
     then 
-      LL=/opt/local/lib
+      LL=@PREFIX@/lib
     fi
     if test -d $HOME/ports/lib
     then 

cslbase/create_old_bundle.sh

@@ -27 +27 @@
 cp $srcdir/../reduce.doc/*.txt                        $D
 cp $srcdir/../reduce.doc/*.tex                        $D
 cp $srcdir/../reduce.doc/*.html                       $D
-# cp $srcdir/../reduce.gif                            $D
+cp $srcdir/../reduce.doc/*.gif                        $D
 F="$1.app/Contents/MacOS/reduce.fonts"
 cp -r $srcdir/fontconfig.conf                         $F
 # Copy everything from my source tree. This makes sense if the tree is

fox/configure.ac

@@ -116 +116 @@
   *darwin*)
 # Ugh! With macports the autoconf recipe that establishes X11 paths
 # fails to include this one but it is needed!
-    CXXFLAGS="$CXXFLAGS -I/opt/local/include/freetype2"
+    CXXFLAGS="$CXXFLAGS -I@PREFIX@/include/freetype2"
   ;;
   *mingw32*)
     AC_MSG_NOTICE([host_os=$host_os so building for native Windows])
@@ -217 +217 @@
       CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -fstrict-aliasing"
       ;;
   *)
-      CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions -fexpensive-optimizations"
+      CXXFLAGS="${CXXFLAGS} -Wuninitialized -fomit-frame-pointer -ffast-math -fstrict-aliasing -finline-functions"
       LDFLAGS="-s ${LDFLAGS}"
       ;;
     esac

foxtests/configure.ac

@@ -215 +215 @@
     CPPFLAGS="$CPPFLAGS -fno-common -I/usr/X11R6/include"
     DLL_CFLAGS="$CFLAGS -bundle -undefined suppress"
     AC_DEFINE(UNIX,[1],[True if we are running on Unix, Linux, BSD etc])
-    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/opt/local/lib -L/opt/X11/lib"
+    LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L@PREFIX@/lib -L/opt/X11/lib"
     LDFLAGS="$LDFLAGS -framework Carbon -framework CoreServices -framework ApplicationServices"
   fi
   ;;