diff options
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | doc/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | util/Makefile.am | 10 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 2 | ||||
-rw-r--r-- | xft.m4 | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 3fda5cc..f9426a3 100644 --- a/data/Makefile.am +++ b/data/Makefile.am | |||
@@ -9,7 +9,7 @@ all-local: menu init | |||
9 | distclean-local: | 9 | distclean-local: |
10 | rm -f *\~ | 10 | rm -f *\~ |
11 | init: init.in | 11 | init: init.in |
12 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init | 12 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" $(srcdir)/init.in > init |
13 | 13 | ||
14 | menu: ../util/fluxbox-generate_menu | 14 | menu: ../util/fluxbox-generate_menu |
15 | env MENUFILENAME=menu \ | 15 | env MENUFILENAME=menu \ |
diff --git a/doc/Makefile.am b/doc/Makefile.am index 33f453c..cfcf605 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -10,4 +10,4 @@ distclean-local: | |||
10 | rm -f *\~ | 10 | rm -f *\~ |
11 | 11 | ||
12 | fluxbox.1: fluxbox.1.in | 12 | fluxbox.1: fluxbox.1.in |
13 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," fluxbox.1.in > fluxbox.1 | 13 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1 |
diff --git a/src/Makefile.am b/src/Makefile.am index 4257fed..3b913e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -29,7 +29,7 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean | |||
29 | DEFAULT_KEYSFILE=$(pkgdatadir)/keys | 29 | DEFAULT_KEYSFILE=$(pkgdatadir)/keys |
30 | DEFAULT_INITFILE= | 30 | DEFAULT_INITFILE= |
31 | 31 | ||
32 | AM_CPPFLAGS=@CPPFLAGS@ -IFbTk | 32 | AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk |
33 | 33 | ||
34 | bin_PROGRAMS= fluxbox | 34 | bin_PROGRAMS= fluxbox |
35 | BUILT_SOURCES = defaults.hh | 35 | BUILT_SOURCES = defaults.hh |
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 |
@@ -20,7 +20,7 @@ | |||
20 | # DEALINGS IN THE SOFTWARE. | 20 | # DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | # AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 22 | # AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
23 | AC_DEFUN(AM_PATH_XFT1, | 23 | AC_DEFUN([AM_PATH_XFT1], |
24 | [ | 24 | [ |
25 | AC_CHECK_LIB(Xft, XftFontOpen, | 25 | AC_CHECK_LIB(Xft, XftFontOpen, |
26 | XFT_LIBS="-lXft" | 26 | XFT_LIBS="-lXft" |
@@ -30,7 +30,7 @@ AC_DEFUN(AM_PATH_XFT1, | |||
30 | ]) | 30 | ]) |
31 | 31 | ||
32 | # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 32 | # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
33 | AC_DEFUN(AM_PATH_XFT2, | 33 | AC_DEFUN([AM_PATH_XFT2], |
34 | [ | 34 | [ |
35 | if test x$pkg_exec_prefix != x ; then | 35 | if test x$pkg_exec_prefix != x ; then |
36 | xft_args="$xft_args --exec-prefix=$pkg_exec_prefix" | 36 | xft_args="$xft_args --exec-prefix=$pkg_exec_prefix" |
@@ -59,7 +59,7 @@ fi | |||
59 | 59 | ||
60 | # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | 60 | # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
61 | # Test for Xft, and define XFT_CFLAGS and XFT_LIBS | 61 | # Test for Xft, and define XFT_CFLAGS and XFT_LIBS |
62 | AC_DEFUN(AM_PATH_XFT, | 62 | AC_DEFUN([AM_PATH_XFT], |
63 | [ | 63 | [ |
64 | AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], | 64 | AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], |
65 | xft_prefix="$withval", xft_prefix="") | 65 | xft_prefix="$withval", xft_prefix="") |