diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-10-04 17:30:22 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-10-04 17:36:08 -0400 |
| commit | 27ae9d65c838478f1c7e07ec52a6848600865bf1 (patch) | |
| tree | 9538d959f3bb1877e9e73d0d64d6a7491de72294 | |
| parent | 2813d2c1612ce09cf1b8fe8e70d3d122f6b11b69 (diff) | |
fix make distcheck
| -rw-r--r-- | Makefile.am | 32 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 23 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 62570bd0..32c65db5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,13 +41,18 @@ nodist_bin_SCRIPTS = \ data/xsession/openbox-kde-session dist_rc_SCRIPTS = \ - data/environment \ + data/environment + +nodist_rc_SCRIPTS = \ data/autostart/autostart dist_libexec_SCRIPTS = \ data/autostart/openbox-xdg-autostart \ data/autostart/openbox-autostart +nodist_libexec_SCRIPTS = \ + data/autostart/openbox-autostart + ## obrender ## @@ -347,7 +352,7 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3 dist_clearlooks_theme_DATA= \ themes/Clearlooks/openbox-3/themerc -clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3 +clearlooks34_themedir = $(themedir)/Clearlooks-3.4/openbox-3 dist_clearlooks34_theme_DATA= \ themes/Clearlooks-3.4/openbox-3/themerc @@ -471,11 +476,15 @@ edit = $(SED) \ data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile @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 @echo make: creating $@ - @$(edit) $< >$@ + @test -d $(shell dirname $(builddir)/$@) || \ + mkdir $(shell dirname $(builddir)/$@) + @$(edit) $< >$(builddir)/$@ %.desktop: %.desktop.in Makefile @echo make: creating $@ @@ -567,16 +576,11 @@ EXTRA_DIST = \ # make clean doesn't delete these for some reason, even though they are # built by make CLEANFILES = \ - doc/openbox.1 \ - doc/openbox-session.1 \ - doc/openbox-gnome-session.1 \ - doc/openbox-kde-session.1 \ - data/xsession/openbox-session \ - data/xsession/openbox-gnome-session \ - data/xsession/openbox-kde-session \ - data/xsession/openbox.desktop \ - data/xsession/openbox-gnome.desktop \ - data/xsession/openbox-kde.desktop + $(nodist_man_MANS) \ + $(nodist_bin_SCRIPTS) \ + $(nodist_xsessions_DATA) \ + $(nodist_rc_SCRIPTS) \ + $(nodist_libexec_SCRIPTS) #doc: # $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc diff --git a/configure.ac b/configure.ac index 4259cda1..78b5aa67 100644 --- a/configure.ac +++ b/configure.ac @@ -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.]) 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]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) |