X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=4562024aced745856d227d1fa4b4c356dbe377c8;hb=4f1bb686a3786ec21b91b37124012927e9b25778;hp=80737053a1c67a5b537782c086c462467772f65a;hpb=b74cff0302e70d702e958a8205a6f6e2e2858192;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 80737053..4562024a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
-bin_SCRIPTS = \
+nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
@@ -351,8 +351,8 @@ nodist_pubinclude_HEADERS = \
 	version.h
 
 nodist_pkgconfig_DATA = \
-	render/obrender-3.0.pc \
-	parser/obparser-3.0.pc
+	render/obrender-3.4.pc \
+	parser/obparser-3.4.pc
 
 ## data ##
 
@@ -375,7 +375,6 @@ data/xsession/openbox-gnome.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox-kde.desktop: \
 		$(srcdir)/data/xsession/openbox-kde.desktop.in
@@ -383,7 +382,6 @@ data/xsession/openbox-kde.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox.desktop: \
 		$(srcdir)/data/xsession/openbox.desktop.in
@@ -391,7 +389,6 @@ data/xsession/openbox.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox-gnome-session: \
 		$(srcdir)/data/xsession/openbox-gnome-session.in
@@ -417,44 +414,25 @@ data/xsession/openbox-session: \
 	@$(edit) $< >$@
 	@chmod a+x $@
 
-doc/openbox.1: $(srcdir)/doc/openbox.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-session.1: $(srcdir)/doc/openbox-session.1.sgml
+%.1.in: %.1.sgml
 	@echo make: creating $@
 	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
+	@docbook-to-man $< >$@
 
-doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml
+%.1: %.1.in
 	@echo make: creating $@
 	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
-
-doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
-	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
-	@$(edit) $< | docbook-to-man - >$@
+	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop
 
-dist_xsessions_DATA = \
+nodist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
 	data/xsession/openbox-gnome.desktop \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	debian/changelog.in \
-	debian/compat \
-	debian/conffiles \
-	debian/control \
-	debian/copyright \
-	debian/menu \
-	debian/postinst \
-	debian/postrm \
-	debian/rules \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -465,8 +443,16 @@ dist_noinst_DATA = \
 	data/xsession/openbox-session.in \
 	data/xsession/openbox-gnome-session.in \
 	data/xsession/openbox-kde-session.in \
-	render/obrender-3.0.pc.in \
-	parser/obparser-3.0.pc.in \
+	doc/openbox.1.sgml \
+	doc/openbox.1.in \
+	doc/openbox-session.1.sgml \
+	doc/openbox-session.1.in \
+	doc/openbox-gnome-session.1.sgml \
+	doc/openbox-gnome-session.1.in \
+	doc/openbox-kde-session.1.sgml \
+	doc/openbox-kde-session.1.in \
+	render/obrender-3.4.pc.in \
+	parser/obparser-3.4.pc.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \
@@ -489,6 +475,8 @@ dist_doc_DATA = \
 	COMPLIANCE \
 	README \
 	AUTHORS \
+	CHANGELOG \
+	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/themerc.xsd \
@@ -501,10 +489,17 @@ dist_man_MANS = \
 	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	config.rpath \
-	mkinstalldirs \
-	CHANGELOG \
-	COPYING
+	mkinstalldirs
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc