projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2813d2c
)
fix make distcheck
author
Dana Jansens
<danakj@orodu.net>
Mon, 4 Oct 2010 21:30:22 +0000
(17:30 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Mon, 4 Oct 2010 21:36:08 +0000
(17:36 -0400)
Makefile.am
patch
|
blob
|
history
configure.ac
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
62570bd
..
32c65db
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-41,13
+41,18
@@
nodist_bin_SCRIPTS = \
data/xsession/openbox-kde-session
dist_rc_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
data/autostart/autostart
dist_libexec_SCRIPTS = \
data/autostart/openbox-xdg-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= \
themes/Clearlooks/openbox-3/themerc
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
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 $@
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 $@
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 $@
%.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 = \
# 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
#doc:
# $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
diff --git
a/configure.ac
b/configure.ac
index
4259cda
..
78b5aa6
100644
(file)
--- 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_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)
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0])
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)