diff options
author | fluxgen <fluxgen> | 2004-04-10 19:52:43 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-04-10 19:52:43 (GMT) |
commit | d26e439375245be6a5c2044be93b952f02ad68f7 (patch) | |
tree | a537e680128208e7a60909bc4b9fc75470ee73b9 /util | |
parent | 52b8cb7d3d8163a4346ce42e322f1faf03bf54d8 (diff) | |
download | fluxbox-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.am | 10 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 2 |
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 |
2 | SUBDIRS= fbrun | 2 | SUBDIRS= fbrun |
3 | INCLUDES= -I../src/FbTk/ | 3 | INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk |
4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox | 4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox |
5 | bin_PROGRAMS= bsetroot | 5 | bin_PROGRAMS= bsetroot |
6 | bsetroot_SOURCES= bsetroot.cc bsetroot.hh | 6 | bsetroot_SOURCES= bsetroot.cc bsetroot.hh |
@@ -16,18 +16,18 @@ all-local: startfluxbox | |||
16 | clean-local: | 16 | clean-local: |
17 | rm -f startfluxbox fluxbox-generate_menu | 17 | rm -f startfluxbox fluxbox-generate_menu |
18 | 18 | ||
19 | bsetroot.o: bsetroot.cc ../config.h bsetroot.hh \ | 19 | bsetroot.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 | ||
22 | startfluxbox: startfluxbox.in | 22 | startfluxbox: 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 | ||
28 | fluxbox-generate_menu: fluxbox-generate_menu.in | 28 | fluxbox-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 @@ | |||
1 | FLUXBOX_SRC_DIR= ../../src/ | 1 | FLUXBOX_SRC_DIR= ../../src/ |
2 | INCLUDES= -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk | 2 | INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk |
3 | bin_PROGRAMS= fbrun | 3 | bin_PROGRAMS= fbrun |
4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm | 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm |
5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | 5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a |