1 files changed, 19 insertions, 13 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index c586c77..3fda5cc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,22 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager
 
-SUBDIRS = styles
-CLEANFILES = menu menu.in menu.pre init
-MAINTAINERCLEANFILES = Makefile.in
-pkgdata_DATA = titlebar keys menu init
-EXTRA_DIST= titlebar keys init.in generate_menu README.style README.menu README
-all-local: menu init
+SUBDIRS=                styles
+CLEANFILES=             menu menu.in menu.pre menu.bak init
+MAINTAINERCLEANFILES=   Makefile.in
+pkgdata_DATA=           keys menu init
+EXTRA_DIST=             keys init.in README.style README.menu README
+all-local:              menu init
 distclean-local:
-        rm -f *\~
-init: init.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
-menu: generate_menu
-        ./generate_menu
-        @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
+                rm -f *\~
+init:                   init.in
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init
+
+menu:                   ../util/fluxbox-generate_menu
+        env     MENUFILENAME=menu \
+                PREFIX="${prefix}" \
+                MENUTITLE="Fluxbox-${VERSION}" \
+                INSTALL=Yes \
+                ../util/fluxbox-generate_menu
+
+../util/fluxbox-generate_menu:
+        cd ../util && ${MAKE} fluxbox-generate_menu