diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /libdotdesktop | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'libdotdesktop')
| -rw-r--r-- | libdotdesktop/make_build_var.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/libdotdesktop/make_build_var.patch b/libdotdesktop/make_build_var.patch index e69de29bb2..dd5d97c768 100644 --- a/libdotdesktop/make_build_var.patch +++ b/libdotdesktop/make_build_var.patch @@ -0,0 +1,58 @@ +--- libdotdesktop-0.11.orig/Makefile 2004-01-13 09:21:54.000000000 +1100 ++++ libdotdesktop-0.11/Makefile 2004-04-28 15:36:02.000000000 +1000 +@@ -4,7 +4,7 @@ + VERSION = 0.11 + CC=gcc + STRIP=strip +-BUILD = ../build ++BUILD = build + + LINGUAS = + +@@ -22,7 +22,8 @@ + endif + CFLAGS += -MD + +-CPPFLAGS += -I./gpe `pkg-config --cflags glib-2.0` ++PACKAGE_CFLAGS = `pkg-config --cflags glib-2.0` ++PACKAGE_LDFLAGS = `pkg-config --libs glib-2.0` + + HEADERS = dotdesktop.h + +@@ -36,13 +37,13 @@ + ln -sf $^ $@ + + $(SONAME): $(OBJS) +- $(CC) -nostartfiles -shared -o $@ $^ -Wl,-soname -Wl,$(SONAME) $(LDFLAGS) ++ $(CC) -nostartfiles -shared -o $@ $^ -Wl,-soname -Wl,$(SONAME) $(PACKAGE_LDFLAGS) $(LDFLAGS) + + libdotdesktop.a: $(OBJS) + ar cq $@ $^ + +-.c.s:; +- $(CC) $(CFLAGS) -S $< ++.c.o:; ++ $(CC) $(PACKAGE_CFLAGS) $(MY_CFLAGS) $(CFLAGS) -c $< -o $@ + + upstream: clean + ( VERSION=`dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1`; cd ..; cp -a libdotdesktop libdotdesktop-$$VERSION.orig; tar czf libdotdesktop_$$VERSION.orig.tar.gz --exclude=libdotdesktop-$$VERSION.orig/debian --exclude=libdotdekstop-$$VERSION.orig/CVS --exclude=libdotdesktop-$$VERSION.orig/familiar libdotdesktop-$$VERSION.orig ; rm -rf libdotdesktop-$$VERSION.orig ) +@@ -55,18 +56,9 @@ + $(STRIP) $(DESTDIR)$(PREFIX)/lib/$(SONAME) + + install-devel: +- for i in $(HEADERS); do install -m 644 -D $$i $(DESTDIR)$(PREFIX)/include/gpe/$$i; done ++ install -m 644 -D dotdesktop.h $(DESTDIR)$(PREFIX)/include/gpe/dotdesktop.h + ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libdotdesktop.so + +-#ipkg: clean +-# rm -rf familiar/dist +-# mkdir -p familiar/dist/CONTROL +-# cp familiar/$(CONTROL) familiar/dist/CONTROL/control +-# cp familiar/postinst familiar/dist/CONTROL +-# make DESTDIR=`pwd`/familiar/dist PREFIX=/usr DEBUG=no install +-# chown -R root.root familiar/dist +-# ipkg-build familiar/dist +- + clean: + rm -f $(OBJS) $(SONAME) libdotdesktop.so $(DEPS) + |