diff options
author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/bootmenu/bootmenu-0.6 | |
parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/bootmenu/bootmenu-0.6')
-rw-r--r-- | packages/bootmenu/bootmenu-0.6/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/bootmenu/bootmenu-0.6/compile.patch | 69 |
2 files changed, 69 insertions, 0 deletions
diff --git a/packages/bootmenu/bootmenu-0.6/.mtn2git_empty b/packages/bootmenu/bootmenu-0.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bootmenu/bootmenu-0.6/.mtn2git_empty diff --git a/packages/bootmenu/bootmenu-0.6/compile.patch b/packages/bootmenu/bootmenu-0.6/compile.patch index e69de29bb2..1d42f59925 100644 --- a/packages/bootmenu/bootmenu-0.6/compile.patch +++ b/packages/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; + |