nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fix, patch from Fr�d�ric L. W. Meunier (1 at pervalidus dot net)

Browse source
This commit is contained in:
fluxgen 2004-04-10 19:52:43 +00:00
parent 52b8cb7d3d
commit d26e439375
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/Makefile.am
View file

@ -9,7 +9,7 @@ all-local: menu init
distclean-local: distclean-local:
rm -f *\~ rm -f *\~
init: init.in init: init.in
@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" $(srcdir)/init.in > init
menu: ../util/fluxbox-generate_menu menu: ../util/fluxbox-generate_menu
env MENUFILENAME=menu \ env MENUFILENAME=menu \

2
doc/Makefile.am
View file

@ -10,4 +10,4 @@ distclean-local:
rm -f *\~ rm -f *\~
fluxbox.1: fluxbox.1.in fluxbox.1: fluxbox.1.in
@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," fluxbox.1.in > fluxbox.1 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1

2
src/Makefile.am
View file

@ -29,7 +29,7 @@ DEFAULT_STYLE=$(pkgdatadir)/styles/Clean
DEFAULT_KEYSFILE=$(pkgdatadir)/keys DEFAULT_KEYSFILE=$(pkgdatadir)/keys
DEFAULT_INITFILE= DEFAULT_INITFILE=
AM_CPPFLAGS=@CPPFLAGS@ -IFbTk AM_CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/FbTk
bin_PROGRAMS= fluxbox bin_PROGRAMS= fluxbox
BUILT_SOURCES = defaults.hh BUILT_SOURCES = defaults.hh

10
util/Makefile.am
View file

@ -1,6 +1,6 @@
# util/Makefile.am for Fluxbox # util/Makefile.am for Fluxbox
SUBDIRS= fbrun SUBDIRS= fbrun
INCLUDES= -I../src/FbTk/ INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
bin_PROGRAMS= bsetroot bin_PROGRAMS= bsetroot
bsetroot_SOURCES= bsetroot.cc bsetroot.hh bsetroot_SOURCES= bsetroot.cc bsetroot.hh
@ -16,18 +16,18 @@ all-local: startfluxbox
clean-local: clean-local:
rm -f startfluxbox fluxbox-generate_menu rm -f startfluxbox fluxbox-generate_menu
bsetroot.o: bsetroot.cc ../config.h bsetroot.hh \ bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
../src/FbRootWindow.hh ../src/FbAtoms.hh $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
startfluxbox: startfluxbox.in startfluxbox: startfluxbox.in
@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-e "s,@pkgbindir@,$(bindir),g" \ -e "s,@pkgbindir@,$(bindir),g" \
startfluxbox.in > startfluxbox $(srcdir)/startfluxbox.in > startfluxbox
-chmod 755 startfluxbox -chmod 755 startfluxbox
fluxbox-generate_menu: fluxbox-generate_menu.in fluxbox-generate_menu: fluxbox-generate_menu.in
@regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \ @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
fluxbox-generate_menu.in \ $(srcdir)/fluxbox-generate_menu.in \
> fluxbox-generate_menu > fluxbox-generate_menu
-chmod 755 fluxbox-generate_menu -chmod 755 fluxbox-generate_menu

2
util/fbrun/Makefile.am
View file

@ -1,5 +1,5 @@
FLUXBOX_SRC_DIR= ../../src/ FLUXBOX_SRC_DIR= ../../src/
INCLUDES= -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
bin_PROGRAMS= fbrun bin_PROGRAMS= fbrun
fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a

6
xft.m4
View file

@ -20,7 +20,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
AC_DEFUN(AM_PATH_XFT1, AC_DEFUN([AM_PATH_XFT1],
[ [
AC_CHECK_LIB(Xft, XftFontOpen, AC_CHECK_LIB(Xft, XftFontOpen,
XFT_LIBS="-lXft" XFT_LIBS="-lXft"
@ -30,7 +30,7 @@ AC_DEFUN(AM_PATH_XFT1,
]) ])
# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
AC_DEFUN(AM_PATH_XFT2, AC_DEFUN([AM_PATH_XFT2],
[ [
if test x$pkg_exec_prefix != x ; then if test x$pkg_exec_prefix != x ; then
xft_args="$xft_args --exec-prefix=$pkg_exec_prefix" xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
@ -59,7 +59,7 @@ fi
# AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for Xft, and define XFT_CFLAGS and XFT_LIBS # Test for Xft, and define XFT_CFLAGS and XFT_LIBS
AC_DEFUN(AM_PATH_XFT, AC_DEFUN([AM_PATH_XFT],
[ [
AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)], AC_ARG_WITH(xft-prefix,[ --with-xft-prefix=path Prefix where Xft is installed (optional)],
xft_prefix="$withval", xft_prefix="") xft_prefix="$withval", xft_prefix="")