From 61ed663464d65d80cca61870be2d51f0fe97a38b Mon Sep 17 00:00:00 2001 From: dolik Date: Sat, 26 Mar 2011 22:44:37 +0000 Subject: [PATCH] .lpbuild: (hopefully) last fix to natty/glib problem git-svn-id: svn://ultimatepp.org/upp/trunk@3313 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/lpbuild/Makefile | 2 +- uppbox/lpbuild/postinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppbox/lpbuild/Makefile b/uppbox/lpbuild/Makefile index 4e93476da..57c6001a9 100755 --- a/uppbox/lpbuild/Makefile +++ b/uppbox/lpbuild/Makefile @@ -165,7 +165,7 @@ echo=$(if $S,,@echo $1) ifneq ($(skip-parse),y) flags:=$(sort $(FLAGS) $(PLATFORM)) -CINC:=$(foreach d,$(NESTS) $(INCPATHS), -I$d) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/local/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/local/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/local/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include/glib-2.0 -I/usr/X11R6/lib/glib-2.0/include -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include/cairo -I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include/atk-1.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/local/include/atk-1.0 -I/usr/local/include -I/usr/local/include/libpng -I/usr/include/gdk-pixbuf-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/amd64-linux-gnu/glib-2.0/include +CINC:=$(foreach d,$(NESTS) $(INCPATHS), -I$d) -I/usr/include/freetype2 -I/usr/include/gtk-2.0 -I/usr/local/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/local/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/local/lib/gtk-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include/glib-2.0 -I/usr/X11R6/lib/glib-2.0/include -I/usr/X11R6/lib/gtk-2.0/include -I/usr/X11R6/include/cairo -I/usr/X11R6/include/pango-1.0 -I/usr/X11R6/include/atk-1.0 -I/usr/local/include/cairo -I/usr/local/include/pango-1.0 -I/usr/local/include/atk-1.0 -I/usr/local/include -I/usr/local/include/libpng -I/usr/include/gdk-pixbuf-2.0 -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include LIBPATH:=$(foreach d,$(LIBPATHS), -L$d) -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib needed-dirs:= begin-group:=-Wl,--start-group diff --git a/uppbox/lpbuild/postinst b/uppbox/lpbuild/postinst index 30915a586..f64d14257 100644 --- a/uppbox/lpbuild/postinst +++ b/uppbox/lpbuild/postinst @@ -33,7 +33,7 @@ sver=9 RELEASE_LINK = "-Wl,--gc-sections"; DEBUGGER = "gdb"; PATH = ""; - INCLUDE = "/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/include/gdk-pixbuf-2.0;/usr/lib/`uname -i`-linux-gnu/glib-2.0/include;" + INCLUDE = "/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/include/gdk-pixbuf-2.0;/usr/lib/i386-linux-gnu/glib-2.0/include;/usr/lib/x86_64-linux-gnu/glib-2.0/include" LIB = "/usr/X11R6/lib"; REMOTE_HOST = ""; REMOTE_OS = "";