[PATCH] fix build when objdir and source dir are different

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

 



Attached.  Seems pretty straightforward.

--xsdg
>From 75abc6e31331137c643d09ac4db7b508a4406327 Mon Sep 17 00:00:00 2001
From: Omari Stephens <xsdg@xxxxxxxx>
Date: Thu, 15 Apr 2010 06:56:23 +0000
Subject: [PATCH] Fix build in case where objdir and srcdir differ

The build currently doesn't work when the build dir is distinct from
the source dir.  This small change fixes that and the build completes
successfully.

Example case where this is true:
$ cd gimpsrc/
$ mkdir builddir
$ cd builddir/
$ ../autogen.sh
$ make

In this case, the (cd) on line 168 of the Makefile will do:
 cd ../../../plug-ins/pygimp/
At which point calling ${PYGTK_CODEGEN} will fail because of the
argument:
 --register ../../../plug-ins/pygimp/gimpcolor-types.def

Because we already cd into that directory, we can get rid of the
extra path specification and we're golden.
---
 plug-ins/pygimp/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am
index 59194bc..f6625e6 100644
--- a/plug-ins/pygimp/Makefile.am
+++ b/plug-ins/pygimp/Makefile.am
@@ -170,8 +170,8 @@ CLEANFILES = gimpui.c gimpthumb.c
 	    --override $*.override \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
-	    --register $(srcdir)/gimpcolor-types.defs \
-	    --register $(srcdir)/gimpenums-types.defs \
+	    --register ./gimpcolor-types.defs \
+	    --register ./gimpenums-types.defs \
 	    --prefix $* $*.defs) > gen-$*.c \
 	 && cp gen-$*.c $*.c \
 	 && rm -f gen-$*.c
-- 
1.7.0.4

_______________________________________________
Gimp-developer mailing list
Gimp-developer@xxxxxxxxxxxxxxxxxxxxxx
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

[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