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 /bootmenu/bootmenu-0.6 | |
| 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 'bootmenu/bootmenu-0.6')
| -rw-r--r-- | bootmenu/bootmenu-0.6/compile.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/bootmenu/bootmenu-0.6/compile.patch b/bootmenu/bootmenu-0.6/compile.patch index e69de29bb2..1d42f59925 100644 --- a/bootmenu/bootmenu-0.6/compile.patch +++ b/bootmenu/bootmenu-0.6/compile.patch @@ -0,0 +1,69 @@ + +# +# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- bootmenu-0.6/src/Makefile~compile ++++ bootmenu-0.6/src/Makefile +@@ -20,9 +20,9 @@ + SOS= + + ifeq ($(HAVE_PLUGINS),y) +-CFLAGS+=-DPLUGINS +-LDFLAGS += -rdynamic +-LIBS += -ldl ++override CFLAGS+=-DPLUGINS -D_PLUGINDIR="\"$(PLUGINDIR)\"" ++override LDFLAGS += -rdynamic ++override LIBS += -ldl + OBJS += plugins.o + SOS = $(patsubst %,%.so,$(PLUGINS)) + +@@ -33,20 +33,22 @@ + endif + + ifeq ($(USE_SYSLOG),y) +-CFLAGS+=-DSYSLOG ++override CFLAGS+=-DSYSLOG + else + OBJS+=log.o + endif + ++DESTDIR= + PREFIX=/usr/local/bin +-PLUGINS=/usr/share/bootmenu ++PLUGINDIR=/usr/share/bootmenu + + all: $(APP) + + install: $(APP) +- cp $(APP) $(PRFIX)/$(APP) +- mkdir -p $(PLUGINS) +- cp *.so $(PLUGINS) ++ install -d $(DESTDIR)$(PREFIX) ++ install -m 0755 $(APP) $(DESTDIR)$(PREFIX)/$(APP) ++ install -d $(DESTDIR)$(PLUGINDIR) ++ install -m 0755 *.so $(DESTDIR)$(PLUGINDIR) + + clean: + rm -f *.o *.so $(APP) +@@ -59,7 +61,7 @@ + ##### + + %.so: %.c +- $(CC) $(CFLAGS) $($(*)_CFLAGS) -shared -o $@ $< $($(*)_LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $($(*)_CFLAGS) -shared -o $@ $< $($(*)_LIBS) + + plugins.o: plugins.c + $(CC) -c $(CFLAGS) -DDEFAULT_PLUGIN="\"$(DEFAULT_PLUGIN)\"" -o $@ $< +--- bootmenu-0.6/src/plugins.c~compile ++++ bootmenu-0.6/src/plugins.c +@@ -28,7 +28,9 @@ + #include <fcntl.h> + #include "bootmenu.h" + ++#ifndef _PLUGINDIR + #define _PLUGINDIR "/usr/share/bootmenu" ++#endif + + extern struct config bootmenu_config; + |