1 files changed, 6 insertions, 7 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index c586c77..69916c1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,15 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager
 
 SUBDIRS = styles
+bin_SCRIPTS = fluxbox-generate_menu
 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
+pkgdata_DATA = keys menu init
+EXTRA_DIST= keys init.in fluxbox-generate_menu 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
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init
+menu: fluxbox-generate_menu
+        sh ./fluxbox-generate_menu -o menu -p ${prefix}/share -m "Fluxbox-${VERSION}"