[Gimp-developer] gimptool and DESTDIR support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Way back in January I submitted a patch to add DESTDIR support to
gimptool, primarily for using it in Makefiles, as you can't install a
plugin to any location except it's final destination.  This prevents
installing it into an alternate location, for example when packaging it
for Debian.  I regard this as a quite serious deficiency in gimptool
which limits its usefulness.

My patch was applied to the CVS head, but not to the 1.2 branch and now
it has been lost now gimptool.in has been replaced with gimptool-1.3.in.

Please would you consider the following two patches for inclusion into
the GIMP.  The first adds DESTDIR support to 1.2 gimptool.in, the second
to 1.3 gimptool-1.3.in.  The former includes a fix for the manpage too,
but there is no manpage in 1.3.

I made the patches against the CVS GIMP_1_2_3_PRE2 and HEAD branches.

Regards,
Roger

1.2 patch:
----------
diff -urN gimp.orig/gimptool.1.in gimp/gimptool.1.in
--- gimp.orig/gimptool.1.in	Thu Dec  6 16:55:31 2001
+++ gimp/gimptool.1.in	Thu Dec  6 16:53:51 2001
@@ -193,6 +193,9 @@
 .B CFLAGS
 to get the preferred flags to pass to the C compiler for plug-in building.
 .TP 8
+.B DESTDIR
+to add a prefix to the install/uninstall path.
+.TP 8
 .B LDFLAGS
 to get the prefered flags for passing to the linker.
 .TP 8
diff -urN gimp.orig/gimptool.in gimp/gimptool.in
--- gimp.orig/gimptool.in	Thu Dec  6 16:55:31 2001
+++ gimp/gimptool.in	Thu Dec  6 16:53:48 2001
@@ -256,7 +256,7 @@
           shift
           if test "x$1" != "x"; then
             if test -f "$install_dir/$1"; then
-              cmd="rm -f $install_dir/$1"
+              cmd="rm -f $DESTDIR$install_dir/$1"
               test $quiet = "yes" || echo $cmd
               test $donothing = "yes" || exec $cmd
             else
@@ -272,7 +272,7 @@
           shift
           if test "x$1" != "x"; then
             if test -r "$1"; then
-              cmd="$install_cmd $1 $install_dir/$1"
+              cmd="$install_cmd $1 $DESTDIR$install_dir/$1"
               test $quiet = "yes" || echo $cmd
               test $donothing = "yes" || exec $cmd
             else

1.3 patch:
----------
diff -urN gimp.orig/gimptool-1.3.in gimp/gimptool-1.3.in
--- gimp.orig/gimptool-1.3.in	Thu Dec  6 16:59:41 2001
+++ gimp/gimptool-1.3.in	Thu Dec  6 17:00:24 2001
@@ -244,7 +244,7 @@
           shift
           if test "x$1" != "x"; then
             if test -f "$install_dir/$1"; then
-              cmd="rm -f $install_dir/$1"
+              cmd="rm -f $DESTDIR$install_dir/$1"
               test $quiet = "yes" || echo $cmd
               test $donothing = "yes" || exec $cmd
             else
@@ -260,7 +260,7 @@
           shift
           if test "x$1" != "x"; then
             if test -r "$1"; then
-              cmd="$install_cmd $1 $install_dir/$1"
+              cmd="$install_cmd $1 $DESTDIR$install_dir/$1"
               test $quiet = "yes" || echo $cmd
               test $donothing = "yes" || exec $cmd
             else

-- 
Roger Leigh
                ** Registration Number: 151826, http://counter.li.org **
                Need Epson Stylus Utilities? http://gimp-print.sourceforge.net/
                GPG Public Key: 0x25BFB848 available on public keyservers


[Index of Archives]     [Video For Linux]     [Photo]     [Yosemite News]     [gtk]     [GIMP for Windows]     [KDE]     [GEGL]     [Gimp's Home]     [Gimp on GUI]     [Gimp on Windows]     [Steve's Art]

  Powered by Linux