summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-04-25 08:36:26 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-04-25 08:36:26 (GMT)
commit2301968bd96aa9406bf8dab008a5d9e313570ddb (patch)
tree98af3fe970dd7883bafbe57d0574b38af4284f6e /data
parent79daf5b1877c6fb98b80680b2f320bbbb92a6d63 (diff)
downloadfluxbox_lack-2301968bd96aa9406bf8dab008a5d9e313570ddb.zip
fluxbox_lack-2301968bd96aa9406bf8dab008a5d9e313570ddb.tar.bz2
add fbrun to default apps file
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am17
1 files changed, 13 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 80fed6a..4a0bd10 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,14 +6,15 @@ PROGRAM_SUFFIX=@program_suffix@
6DEFAULT_MENU = @DEFAULT_MENU@ 6DEFAULT_MENU = @DEFAULT_MENU@
7DEFAULT_STYLE = @DEFAULT_STYLE@ 7DEFAULT_STYLE = @DEFAULT_STYLE@
8DEFAULT_KEYS = @DEFAULT_KEYS@ 8DEFAULT_KEYS = @DEFAULT_KEYS@
9DEFAULT_APPS = @DEFAULT_APPS@
9DEFAULT_INIT = @DEFAULT_INIT@ 10DEFAULT_INIT = @DEFAULT_INIT@
10 11
11SUBDIRS= styles 12SUBDIRS= styles
12CLEANFILES= menu menu.in menu.pre menu.bak init 13CLEANFILES= menu menu.in menu.pre menu.bak init apps
13MAINTAINERCLEANFILES= Makefile.in 14MAINTAINERCLEANFILES= Makefile.in
14pkgdata_DATA= keys menu init 15pkgdata_DATA= keys menu init apps
15EXTRA_DIST= keys init.in 16EXTRA_DIST= keys init.in apps.in
16all-local: menu init 17all-local: menu init apps
17install-pkgdataDATA: 18install-pkgdataDATA:
18 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" 19 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
19 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) 20 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
@@ -21,6 +22,9 @@ install-pkgdataDATA:
21 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" 22 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
22 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) 23 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
23 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS) 24 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
25 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
26 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
27 $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
24 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" 28 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
25 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) 29 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
26 $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT) 30 $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
@@ -33,6 +37,11 @@ init: init.in
33 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \ 37 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
34 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init 38 -e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
35 39
40apps: apps.in
41 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
42 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
43 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
44
36menu: ../util/fluxbox-generate_menu 45menu: ../util/fluxbox-generate_menu
37 env MENUFILENAME=menu \ 46 env MENUFILENAME=menu \
38 PREFIX="${prefix}" \ 47 PREFIX="${prefix}" \