SOURCES: fluxbox-dont_generate_menu.patch - updated (by Pawel 'duddits' Dlu...

[pluto]

Author: pluto                        Date: Thu Sep  4 10:29:35 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated (by Pawel 'duddits' Dlugosz).

---- Files affected:
SOURCES:
   fluxbox-dont_generate_menu.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/fluxbox-dont_generate_menu.patch
diff -u SOURCES/fluxbox-dont_generate_menu.patch:1.3 SOURCES/fluxbox-dont_generate_menu.patch:1.4
--- SOURCES/fluxbox-dont_generate_menu.patch:1.3	Tue Oct  9 20:27:40 2007
+++ SOURCES/fluxbox-dont_generate_menu.patch	Thu Sep  4 12:29:29 2008
@@ -1,22 +1,37 @@
---- fluxbox-1.0.0/data/Makefile.am	2007-10-09 20:07:50.211422282 +0200
-+++ fluxbox-1.0.0/data/Makefile.am-new	2007-10-09 20:10:10.427236759 +0200
-@@ -11,13 +11,10 @@
+--- fluxbox-1.1.0/data/Makefile.am	2008-07-14 21:33:31.000000000 +0200
++++ fluxbox-1.1.0/data/Makefile.am-new	2008-09-04 10:21:09.836934308 +0200
+@@ -14,28 +14,16 @@
  SUBDIRS= 		styles
- CLEANFILES= 		menu menu.in menu.pre menu.bak init
+ CLEANFILES= 		menu menu.in menu.pre menu.bak init apps
  MAINTAINERCLEANFILES= 	Makefile.in
--pkgdata_DATA= 		keys menu init
+-pkgdata_DATA= 		keys menu init apps overlay
 +pkgdata_DATA= 		keys init
- EXTRA_DIST= 		keys init.in
- all-local: 		menu init
+ EXTRA_DIST= 		keys init.in apps.in overlay
+ all-local: 		menu init apps
  install-pkgdataDATA:
 -	@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
 -	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
--	$(INSTALL_DATA) menu $(DESTDIR)$(DEFAULT_MENU)
+-	$(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU)
  	@echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
  	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
  	$(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
-@@ -34,12 +31,6 @@
- 			-e "s, at default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
+-	@echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
+-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
+-	$(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
+-	@echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
+-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
+-	$(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
+ 	@echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
+ 	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
+ 	$(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT)
+-	@echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
+-	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
+-	$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
+ 
+ distclean-local:
+ 		rm -f *\~
+@@ -51,12 +39,6 @@
+ 			-e "s, at pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
  
  menu: 			../util/fluxbox-generate_menu
 -	env	MENUFILENAME=menu \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/fluxbox-dont_generate_menu.patch?r1=1.3&r2=1.4&f=u