--- plug-ins/Makefile.in.orig Thu Feb 27 05:41:52 1997 +++ plug-ins/Makefile.in Thu Feb 27 08:46:09 1997 @@ -28,6 +28,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. @@ -58,7 +59,7 @@ X_LDFLAGS = X_LIBS = -pluginlibdir = $(pkglibdir)/plug-ins +pluginlibdir = $(pkglibexecdir)/plug-ins pluginlib_PROGRAMS = \ blur \ --- ./app/batch.c~ Mon Feb 24 14:38:51 1997 +++ ./app/batch.c Wed Feb 26 08:51:05 1997 @@ -3,7 +3,7 @@ #include #include #include - +#include #include "appenv.h" #include "app_procs.h" #include "batch.h" --- ./app/xcf.c~ Wed Feb 26 05:21:25 1997 +++ ./app/xcf.c Wed Feb 26 09:07:30 1997 @@ -1,3 +1,4 @@ +#include #include #include #include --- configure.orig Thu Feb 27 09:55:32 1997 +++ configure Thu Feb 27 09:55:40 1997 @@ -609,7 +609,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - +INSTALL_SCRIPT="/usr/bin/install -c -m 755" test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' @@ -2040,7 +2040,7 @@ CFLAGS="$OPTFLAG $CFLAGS" gimpdatadir=$datadir/$PACKAGE -gimpplugindir=$libdir/$PACKAGE +gimpplugindir=$libexecdir/$PACKAGE --- gtk+/configure~ Thu Feb 27 03:09:52 1997 +++ gtk+/configure Thu Feb 27 15:10:18 1997 @@ -569,6 +569,7 @@ # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo "configure:572: checking for a BSD compatible install" >&5 +INSTALL="/usr/bin/install -c" if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- gtk+/glib/configure~ Thu Feb 27 15:32:15 1997 +++ gtk+/glib/configure Thu Feb 27 15:32:47 1997 @@ -559,6 +559,7 @@ # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo "configure:562: checking for a BSD compatible install" >&5 +INSTALL="/usr/bin/install -c" if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- plug-ins/script-fu/Makefile.in.orig Thu Feb 27 20:47:10 1997 +++ plug-ins/script-fu/Makefile.in Thu Feb 27 20:46:30 1997 @@ -59,7 +59,7 @@ SUBDIRS = scripts -pluginlibdir = $(pkglibdir)/plug-ins +pluginlibdir = $(gimpplugindir)/plug-ins pluginlib_PROGRAMS = script-fu *** /tmp/gimp-0.99.1/app/gimprc.c Thu Feb 27 06:43:10 1997 --- ./app/gimprc.c Thu Feb 27 16:41:19 1997 *************** *** 159,161 **** ! sprintf (libfilename, "%s/gimprc", LIBDIR); parse_gimprc_file (libfilename); --- 159,161 ---- ! sprintf (libfilename, "%s/gimprc", DATADIR); parse_gimprc_file (libfilename);