aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-04-10 19:52:43 (GMT)
committerfluxgen <fluxgen>2004-04-10 19:52:43 (GMT)
commitd26e439375245be6a5c2044be93b952f02ad68f7 (patch)
treea537e680128208e7a60909bc4b9fc75470ee73b9 /util
parent52b8cb7d3d8163a4346ce42e322f1faf03bf54d8 (diff)
downloadfluxbox-d26e439375245be6a5c2044be93b952f02ad68f7.zip
fluxbox-d26e439375245be6a5c2044be93b952f02ad68f7.tar.bz2
minor fix, patch from Fr�d�ric L. W. Meunier (1 at pervalidus dot net)
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am10
-rw-r--r--util/fbrun/Makefile.am2
2 files changed, 6 insertions, 6 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index c5fb97a..66376f4 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
1# util/Makefile.am for Fluxbox 1# util/Makefile.am for Fluxbox
2SUBDIRS= fbrun 2SUBDIRS= fbrun
3INCLUDES= -I../src/FbTk/ 3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= bsetroot 5bin_PROGRAMS= bsetroot
6bsetroot_SOURCES= bsetroot.cc bsetroot.hh 6bsetroot_SOURCES= bsetroot.cc bsetroot.hh
@@ -16,18 +16,18 @@ all-local: startfluxbox
16clean-local: 16clean-local:
17 rm -f startfluxbox fluxbox-generate_menu 17 rm -f startfluxbox fluxbox-generate_menu
18 18
19bsetroot.o: bsetroot.cc ../config.h bsetroot.hh \ 19bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
20 ../src/FbRootWindow.hh ../src/FbAtoms.hh 20 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
21 21
22startfluxbox: startfluxbox.in 22startfluxbox: startfluxbox.in
23 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ 23 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
24 -e "s,@pkgbindir@,$(bindir),g" \ 24 -e "s,@pkgbindir@,$(bindir),g" \
25 startfluxbox.in > startfluxbox 25 $(srcdir)/startfluxbox.in > startfluxbox
26 -chmod 755 startfluxbox 26 -chmod 755 startfluxbox
27 27
28fluxbox-generate_menu: fluxbox-generate_menu.in 28fluxbox-generate_menu: fluxbox-generate_menu.in
29 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \ 29 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
30 fluxbox-generate_menu.in \ 30 $(srcdir)/fluxbox-generate_menu.in \
31 > fluxbox-generate_menu 31 > fluxbox-generate_menu
32 -chmod 755 fluxbox-generate_menu 32 -chmod 755 fluxbox-generate_menu
33 33
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
index 6f4752a..83b45b0 100644
--- a/util/fbrun/Makefile.am
+++ b/util/fbrun/Makefile.am
@@ -1,5 +1,5 @@
1FLUXBOX_SRC_DIR= ../../src/ 1FLUXBOX_SRC_DIR= ../../src/
2INCLUDES= -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk 2INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
3bin_PROGRAMS= fbrun 3bin_PROGRAMS= fbrun
4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm 4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a 5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a