aboutsummaryrefslogtreecommitdiff
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
parent52b8cb7d3d8163a4346ce42e322f1faf03bf54d8 (diff)
downloadfluxbox_pavel-d26e439375245be6a5c2044be93b952f02ad68f7.zip
fluxbox_pavel-d26e439375245be6a5c2044be93b952f02ad68f7.tar.bz2
minor fix, patch from Fr�d�ric L. W. Meunier (1 at pervalidus dot net)
-rw-r--r--data/Makefile.am2
-rw-r--r--doc/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--util/Makefile.am10
-rw-r--r--util/fbrun/Makefile.am2
-rw-r--r--xft.m46
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
9distclean-local: 9distclean-local:
10 rm -f *\~ 10 rm -f *\~
11init: init.in 11init: 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
14menu: ../util/fluxbox-generate_menu 14menu: ../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
12fluxbox.1: fluxbox.1.in 12fluxbox.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
29DEFAULT_KEYSFILE=$(pkgdatadir)/keys 29DEFAULT_KEYSFILE=$(pkgdatadir)/keys
30DEFAULT_INITFILE= 30DEFAULT_INITFILE=
31 31
32AM_CPPFLAGS=@CPPFLAGS@ -IFbTk 32AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
33 33
34bin_PROGRAMS= fluxbox 34bin_PROGRAMS= fluxbox
35BUILT_SOURCES = defaults.hh 35BUILT_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
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
diff --git a/xft.m4 b/xft.m4
index 4a92cb0..7264e97 100644
--- a/xft.m4
+++ b/xft.m4
@@ -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]]])
23AC_DEFUN(AM_PATH_XFT1, 23AC_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]]])
33AC_DEFUN(AM_PATH_XFT2, 33AC_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
62AC_DEFUN(AM_PATH_XFT, 62AC_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="")