Merge branch 'master' into to_push

1 files changed, 23 insertions, 6 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 80fed6a..e921afa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,24 +6,36 @@ PROGRAM_SUFFIX=@program_suffix@
 DEFAULT_MENU = @DEFAULT_MENU@
 DEFAULT_STYLE = @DEFAULT_STYLE@
 DEFAULT_KEYS = @DEFAULT_KEYS@
+DEFAULT_APPS = @DEFAULT_APPS@
+DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
 DEFAULT_INIT = @DEFAULT_INIT@
+DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
 
 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
-EXTRA_DIST=             keys init.in
-all-local:              menu init
+pkgdata_DATA=           keys menu init apps overlay
+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)
+        @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) init $(DESTDIR)$(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 *\~
@@ -33,6 +45,11 @@ init: 			init.in
                         -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
                         -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
 
+apps:                   apps.in
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+                        -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
+                        -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
+
 menu:                   ../util/fluxbox-generate_menu
         env     MENUFILENAME=menu \
                 PREFIX="${prefix}" \