|
Hi Chris la 04/26/2011 07:13 AM Christopher Roy Bratusek skribis: On Tuesday 26 April 2011 02:56:55 Daniel Pfeiffer wrote:now there's a new snapshot of makepp out, I'm trying to build the sawfish suite, but am failing on the last piece. Even though I have a pkgconfig/sawfish.pc installed and point configure --prefix=/.../sawfish PKG_CONFIG_PATH=/.../sawfish/lib/pkgconfig to it, the Cflags are not being picked up, leading to sawfishpager.c:32: fatal error: sawfish/libclient.h: No such file or directorytry export PKG_CONFIG_PATH=(...) and then configure, atleast it worked here and for Daniel Fetchinson. Except... you use Sawfish 1.8.1 from GIT, then you'll need SawfishPager 0.90.2 from GIT, too. Thanks for the tip! I downloaded all of today's latest stuff, and it's compileable with makepp. So I have made some tweaks to get rid of VPATH (used only for one file) thereby eliminating workarounds. Only one remains in librep: rules.mk gets included before the rule to build it, requiring an ugly makepp --defer-include. It's not obvious to me how to change the order, as it's split over two different .in files. (sawfish has this setup differently, explicitly including Makedefs, so there it would have been easy, but it has no such harmful include) coralament / best Grötens / liebe Grüße / best regards / elkorajn salutojn
Daniel Pfeiffer
--
lerne / learn / apprends / lär dig / ucz się Esperanto:
http://lernu.net / http://ikurso.net
|
diff -wrup librep-0.92.0/ChangeLog librep-0.92.0a/ChangeLog --- librep-0.92.0/ChangeLog 2011-05-01 09:03:24.000000000 +0200 +++ librep-0.92.0a/ChangeLog 2011-05-04 23:13:59.052416000 +0200 @@ -1,3 +1,6 @@ +2011-05-04 Daniel Pfeiffer <occitan esperanto org> + * **/Makefile.in: remove VPATH to appease makepp + 2011-04-14 Christopher Bratusek <nano tuxfamily org> * configure.in * Makefile.in: remove version from install-paths diff -wrup librep-0.92.0/intl/Makefile.in librep-0.92.0a/intl/Makefile.in --- librep-0.92.0/intl/Makefile.in 2011-05-01 09:03:25.000000000 +0200 +++ librep-0.92.0a/intl/Makefile.in 2011-05-04 23:11:47.892415645 +0200 @@ -23,7 +23,6 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = .. -VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff -wrup librep-0.92.0/lisp/Makefile.in librep-0.92.0a/lisp/Makefile.in --- librep-0.92.0/lisp/Makefile.in 2011-05-01 09:03:25.000000000 +0200 +++ librep-0.92.0a/lisp/Makefile.in 2011-05-04 23:10:11.788416113 +0200 @@ -19,7 +19,6 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. top_builddir=.. -VPATH=@srcdir@:@top_srcdir@ INSTALL_FILES = *.jl *.jlc @@ -52,7 +51,7 @@ install : all installdirs done $(SHELL) $(top_srcdir)/install-aliases -l . $(DESTDIR)$(replispdir) -installdirs : mkinstalldirs +installdirs : $(top_srcdir)/mkinstalldirs $(SHELL) $< $(foreach x,$(INSTALL_DIRS),$(DESTDIR)$(replispdir)/$(x)) uninstall : diff -wrup librep-0.92.0/Makefile.in librep-0.92.0a/Makefile.in --- librep-0.92.0/Makefile.in 2011-05-01 09:03:24.000000000 +0200 +++ librep-0.92.0a/Makefile.in 2011-05-04 23:11:35.940417091 +0200 @@ -21,7 +21,6 @@ ETAGS:= etags top_builddir=. -VPATH=@srcdir@ ALL_SUBDIRS = intl src lisp man INSTALL_SUBDIRS = src lisp man diff -wrup librep-0.92.0/man/Makefile.in librep-0.92.0a/man/Makefile.in --- librep-0.92.0/man/Makefile.in 2011-05-01 09:03:31.000000000 +0200 +++ librep-0.92.0a/man/Makefile.in 2011-05-04 23:10:01.744416156 +0200 @@ -20,7 +20,6 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -VPATH=@srcdir@:@top_srcdir@ SRCS = librep.texi lang.texi repl.texi news.texi interface.texi @@ -54,7 +53,7 @@ install : librep.info installdirs $(INSTALL_DATA) $$f.gz $(DESTDIR)$(prefix)/share/man/man1/; \ done -installdirs : mkinstalldirs +installdirs : $(top_srcdir)/mkinstalldirs $(SHELL) $< $(DESTDIR)$(infodir) $(SHELL) $< $(DESTDIR)$(prefix)/share/man/man1/ diff -wrup librep-0.92.0/src/Makefile.in librep-0.92.0a/src/Makefile.in --- librep-0.92.0/src/Makefile.in 2011-05-01 09:03:31.000000000 +0200 +++ librep-0.92.0a/src/Makefile.in 2011-05-04 23:09:47.628416353 +0200 @@ -19,7 +19,6 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. top_builddir=.. -VPATH=@srcdir@:@top_srcdir@ COMMON_SRCS = continuations.c datums.c debug-buffer.c files.c find.c \ fluids.c gh.c lisp.c lispcmds.c lispmach.c macros.c main.c \ @@ -105,7 +104,7 @@ install : all installdirs done $(SHELL) $(top_srcdir)/install-aliases -c . $(DESTDIR)$(repexecdir) -installdirs : mkinstalldirs +installdirs : $(top_srcdir)/mkinstalldirs $(SHELL) $< $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ $(foreach x,$(DL_DIRS),$(DESTDIR)$(repexecdir)/$(x)) \ $(DESTDIR)$(includedir)/rep/
diff -wrup sawfish-1.8.1/ChangeLog sawfish-1.8.1a/ChangeLog
--- sawfish-1.8.1/ChangeLog 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/ChangeLog 2011-05-05 00:26:36.196415861 +0200
@@ -1,3 +1,6 @@
+2011-05-04 Daniel Pfeiffer <occitan esperanto org>
+ * **/Makefile.in: remove VPATH to appease makepp
+
2011-04-26 Christopher Roy Bratusek <nano tuxfamily org>
* lisp/sawfish/wm/autoload.jl: removed maybe-raise-tab
from autoload, aswell as viewport-linear stuff
diff -wrup sawfish-1.8.1/lisp/Makefile.in sawfish-1.8.1a/lisp/Makefile.in
--- sawfish-1.8.1/lisp/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/lisp/Makefile.in 2011-05-05 00:25:31.060415843 +0200
@@ -23,7 +23,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
-VPATH=@srcdir@:@top_srcdir@
REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
@@ -73,7 +72,7 @@ install : all installdirs
done
$(rep_INSTALL_ALIASES) -l . $(DESTDIR)$(lispdir)
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(foreach x,$(INSTALL_DIRS),$(DESTDIR)$(lispdir)/$(x))
uninstall :
diff -wrup sawfish-1.8.1/lisp/sawfish/cfg/Makefile.in sawfish-1.8.1a/lisp/sawfish/cfg/Makefile.in
--- sawfish-1.8.1/lisp/sawfish/cfg/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/lisp/sawfish/cfg/Makefile.in 2011-05-05 00:25:31.060415843 +0200
@@ -20,12 +20,12 @@
# along with sawfish; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+makepp_percent_subdirs=1
include ../../../Makedefs
top_builddir=../../..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
diff -wrup sawfish-1.8.1/lisp/sawfish/gtk/Makefile.in sawfish-1.8.1a/lisp/sawfish/gtk/Makefile.in
--- sawfish-1.8.1/lisp/sawfish/gtk/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/lisp/sawfish/gtk/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -20,12 +20,12 @@
# along with sawfish; see the file COPYING. If not, write to
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+makepp_percent_subdirs=1
include ../../../Makedefs
top_builddir=../../../
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
diff -wrup sawfish-1.8.1/Makefile.in sawfish-1.8.1a/Makefile.in
--- sawfish-1.8.1/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -23,7 +23,6 @@ include ./Makedefs
top_builddir=.
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@
SUBDIRS = @SUBDIRS@
diff -wrup sawfish-1.8.1/man/Makefile.in sawfish-1.8.1a/man/Makefile.in
--- sawfish-1.8.1/man/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/man/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -23,7 +23,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
SRCS = sawfish.texi news.texi faq.texi
@@ -61,7 +60,7 @@ install : sawfish.info installdirs
$(INSTALL_DATA) $$f.gz $(DESTDIR)$(prefix)/share/man/man1/; \
done
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(DESTDIR)$(infodir)
$(SHELL) $< $(DESTDIR)$(prefix)/share/man/man1/
diff -wrup sawfish-1.8.1/po/Makefile.in sawfish-1.8.1a/po/Makefile.in
--- sawfish-1.8.1/po/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/po/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -23,7 +23,6 @@ include ../Makedefs
top_srcdir=@top_srcdir@
top_builddir=..
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
PACKAGE=sawfish
MSGMERGE=msgmerge
diff -wrup sawfish-1.8.1/scripts/Makefile.in sawfish-1.8.1a/scripts/Makefile.in
--- sawfish-1.8.1/scripts/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/scripts/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -24,7 +24,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
LISP_SRCS := sawfish-menu.jl sawfish-client.jl sawfish-about.jl
LISP_OBJS := $(LISP_SRCS:.jl=.jlc)
@@ -56,7 +55,7 @@ uninstall :
rm -f $(DESTDIR)${sawfishexecdir}/sawfish-about
rm -f $(DESTDIR)$(sawfishdir)/sawfish.png
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(sawfishexecdir)
clean :
diff -wrup sawfish-1.8.1/sounds/Makefile.in sawfish-1.8.1a/sounds/Makefile.in
--- sawfish-1.8.1/sounds/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/sounds/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -24,7 +24,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
soundsdir := ${sawfishdir}/sounds
@@ -35,7 +34,7 @@ install : all installdirs
$(INSTALL_DATA) $$f $(DESTDIR)$(soundsdir); \
done
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(DESTDIR)$(soundsdir)
uninstall :
diff -wrup sawfish-1.8.1/src/Makefile.in sawfish-1.8.1a/src/Makefile.in
--- sawfish-1.8.1/src/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/src/Makefile.in 2011-05-05 00:25:31.064415875 +0200
@@ -24,7 +24,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
SRCS := colors.c cursors.c display.c events.c fonts.c frames.c flippers.c \
functions.c images.c keys.c main.c multihead.c pixmap-cache.c \
@@ -86,7 +85,7 @@ uninstall :
$(rep_DL_UNINSTALL) -f $(DESTDIR)$(repexecdir)/sawfish/client.la
rm -rf $(DESTDIR)$(includedir)/sawfish/
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
$(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x)) \
$(DESTDIR)$(includedir)/sawfish/
diff -wrup sawfish-1.8.1/themes/Makefile.in sawfish-1.8.1a/themes/Makefile.in
--- sawfish-1.8.1/themes/Makefile.in 2011-05-01 10:15:59.000000000 +0200
+++ sawfish-1.8.1a/themes/Makefile.in 2011-05-05 00:25:31.068416004 +0200
@@ -24,7 +24,6 @@ include ../Makedefs
top_builddir=..
top_srcdir=@top_srcdir@
srcdir=@srcdir@
-VPATH=@srcdir@:@top_srcdir@
themedir := ${sawfishdir}/themes
@@ -58,7 +57,7 @@ install : all installdirs
@# itself slows in librep.
cd $(DESTDIR)$(themedir) && tar xf StyleTab.tar.gz && rm StyleTab.tar.gz
-installdirs : mkinstalldirs
+installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $< $(DESTDIR)$(themedir)
uninstall :