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 /gpe-calculator | |
| 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 'gpe-calculator')
| -rw-r--r-- | gpe-calculator/gpe-calculator-0.2/fix_makefile.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch b/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch index e69de29bb2..b8c6d1a960 100644 --- a/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch +++ b/gpe-calculator/gpe-calculator-0.2/fix_makefile.patch @@ -0,0 +1,47 @@ +diff -urNd ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile gpe-calculator-0.2/Makefile +--- ../gpe-calculator-0.2-r0/gpe-calculator-0.2/Makefile 2004-08-03 04:24:09.000000000 +0100 ++++ gpe-calculator-0.2/Makefile 2004-08-03 13:12:48.000000000 +0100 +@@ -9,17 +9,17 @@ + GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_ENABLE_BROKEN + GTKLDFLAGS += `pkg-config --libs gtk+-2.0` + +-CPPFLAGS = -D_GNU_SOURCE ++PACKAGE_CPPFLAGS = -D_GNU_SOURCE + ifeq ($(DEBUG),yes) +-CFLAGS += -O2 -g +-LDFLAGS = -g #-lefence ++PACKAGE_CFLAGS += -O2 -g ++PACKAGE_LDFLAGS = -g #-lefence + else +-CFLAGS += -Os -fomit-frame-pointer ++PACKAGE_CFLAGS += -Os -fomit-frame-pointer + endif +-CFLAGS += -Wall $(GTKCFLAGS) +-LDFLAGS += $(GTKLDFLAGS) +-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -DPACKAGE_DATA_DIR=\"$(PREFIX)/share\" +-CFLAGS += -MD ++PACKAGE_CFLAGS += -Wall $(GTKCFLAGS) ++PACKAGE_LDFLAGS += $(GTKLDFLAGS) ++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -DPACKAGE_DATA_DIR=\"$(PREFIX)/share\" ++PACKAGE_CFLAGS += -MD + + .SUFFIXES: .d + +@@ -36,14 +36,15 @@ + all: $(PACKAGE) + + $(PACKAGE): $(OBJS) +- $(CC) -o $@ $^ $(LDFLAGS) ++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all + install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + mkdir -p $(DESTDIR)$(PREFIX)/share/applications + install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications +- strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++ install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) |