diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-04-25 08:36:26 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-04-25 08:36:26 (GMT) |
commit | 2301968bd96aa9406bf8dab008a5d9e313570ddb (patch) | |
tree | 98af3fe970dd7883bafbe57d0574b38af4284f6e /data | |
parent | 79daf5b1877c6fb98b80680b2f320bbbb92a6d63 (diff) | |
download | fluxbox_paul-2301968bd96aa9406bf8dab008a5d9e313570ddb.zip fluxbox_paul-2301968bd96aa9406bf8dab008a5d9e313570ddb.tar.bz2 |
add fbrun to default apps file
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 17 |
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@ | |||
6 | DEFAULT_MENU = @DEFAULT_MENU@ | 6 | DEFAULT_MENU = @DEFAULT_MENU@ |
7 | DEFAULT_STYLE = @DEFAULT_STYLE@ | 7 | DEFAULT_STYLE = @DEFAULT_STYLE@ |
8 | DEFAULT_KEYS = @DEFAULT_KEYS@ | 8 | DEFAULT_KEYS = @DEFAULT_KEYS@ |
9 | DEFAULT_APPS = @DEFAULT_APPS@ | ||
9 | DEFAULT_INIT = @DEFAULT_INIT@ | 10 | DEFAULT_INIT = @DEFAULT_INIT@ |
10 | 11 | ||
11 | SUBDIRS= styles | 12 | SUBDIRS= styles |
12 | CLEANFILES= menu menu.in menu.pre menu.bak init | 13 | CLEANFILES= menu menu.in menu.pre menu.bak init apps |
13 | MAINTAINERCLEANFILES= Makefile.in | 14 | MAINTAINERCLEANFILES= Makefile.in |
14 | pkgdata_DATA= keys menu init | 15 | pkgdata_DATA= keys menu init apps |
15 | EXTRA_DIST= keys init.in | 16 | EXTRA_DIST= keys init.in apps.in |
16 | all-local: menu init | 17 | all-local: menu init apps |
17 | install-pkgdataDATA: | 18 | install-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 | ||
40 | apps: 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 | |||
36 | menu: ../util/fluxbox-generate_menu | 45 | menu: ../util/fluxbox-generate_menu |
37 | env MENUFILENAME=menu \ | 46 | env MENUFILENAME=menu \ |
38 | PREFIX="${prefix}" \ | 47 | PREFIX="${prefix}" \ |