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

fix make distcheck

Browse source
This commit is contained in:
Dana Jansens 2010-10-04 17:30:22 -04:00
parent 2813d2c161
commit 27ae9d65c8
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Makefile.am
View file

@ -41,13 +41,18 @@ nodist_bin_SCRIPTS = \
data/xsession/openbox-kde-session data/xsession/openbox-kde-session
dist_rc_SCRIPTS = \ dist_rc_SCRIPTS = \
data/environment \ data/environment
nodist_rc_SCRIPTS = \
data/autostart/autostart data/autostart/autostart
dist_libexec_SCRIPTS = \ dist_libexec_SCRIPTS = \
data/autostart/openbox-xdg-autostart \ data/autostart/openbox-xdg-autostart \
data/autostart/openbox-autostart data/autostart/openbox-autostart
nodist_libexec_SCRIPTS = \
data/autostart/openbox-autostart
## obrender ## ## obrender ##
@ -347,7 +352,7 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
dist_clearlooks_theme_DATA= \ dist_clearlooks_theme_DATA= \
themes/Clearlooks/openbox-3/themerc themes/Clearlooks/openbox-3/themerc
clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 clearlooks34_themedir = $(themedir)/Clearlooks-3.4/openbox-3
dist_clearlooks34_theme_DATA= \ dist_clearlooks34_theme_DATA= \
themes/Clearlooks-3.4/openbox-3/themerc themes/Clearlooks-3.4/openbox-3/themerc
@ -471,11 +476,15 @@ edit = $(SED) \
data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
@echo make: creating $@ @echo make: creating $@
@$(edit) $< >$@ @test -d $(shell dirname $(builddir)/$@) || \
mkdir $(shell dirname $(builddir)/$@)
@$(edit) $< >$(builddir)/$@
data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
@echo make: creating $@ @echo make: creating $@
@$(edit) $< >$@ @test -d $(shell dirname $(builddir)/$@) || \
mkdir $(shell dirname $(builddir)/$@)
@$(edit) $< >$(builddir)/$@
%.desktop: %.desktop.in Makefile %.desktop: %.desktop.in Makefile
@echo make: creating $@ @echo make: creating $@
@ -567,16 +576,11 @@ EXTRA_DIST = \
# make clean doesn't delete these for some reason, even though they are # make clean doesn't delete these for some reason, even though they are
# built by make # built by make
CLEANFILES = \ CLEANFILES = \
doc/openbox.1 \ $(nodist_man_MANS) \
doc/openbox-session.1 \ $(nodist_bin_SCRIPTS) \
doc/openbox-gnome-session.1 \ $(nodist_xsessions_DATA) \
doc/openbox-kde-session.1 \ $(nodist_rc_SCRIPTS) \
data/xsession/openbox-session \ $(nodist_libexec_SCRIPTS)
data/xsession/openbox-gnome-session \
data/xsession/openbox-kde-session \
data/xsession/openbox.desktop \
data/xsession/openbox-gnome.desktop \
data/xsession/openbox-kde.desktop
#doc: #doc:
# $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc

5
configure.ac
View file

@ -98,6 +98,11 @@ if test "$SED" = "no"; then
AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.])
fi fi
AC_PATH_PROG([DIRNAME], [dirname], [no])
if test "$DIRNAME" = "no"; then
AC_MSG_ERROR([The program "dirname" is not available. This program is required to build Openbox.])
fi
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)