icewm/icewm-docdir.patch

diff --git Makefile.in Makefile.in
index 92f76aa..54a67aa 100644
--- Makefile.in
+++ Makefile.in
@@ -119,12 +119,12 @@ install-base: base
 
 install-docs: docs
 	@echo ------------------------------------------
-	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm"
+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm"
 	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
-	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm"
+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"
 	@echo ------------------------------------------
 
 install-nls: nls
diff --git src/Makefile.in src/Makefile.in
index 73f015b..46aea83 100644
--- src/Makefile.in
+++ src/Makefile.in
@@ -32,7 +32,7 @@ DEFS =          @DEFS@ \
                 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
                 -DICESMEXE='"icewm-session$(EXEEXT)"' \
                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
-                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+                -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
 
 CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`
Accepting request 224110 from home:scarabeus_iv - update version to 1.3.8 - remove patches:icewm-gcc47.patch,icewm-x11.patch - add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch for new fate #313170 OBS-URL: https://build.opensuse.org/request/show/224110 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=27 2014-02-27 14:47:29 +00:00			`diff --git Makefile.in Makefile.in`
			`index 92f76aa..54a67aa 100644`
			`--- Makefile.in`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=1 2007-04-20 21:31:14 +00:00			`+++ Makefile.in`
Accepting request 224110 from home:scarabeus_iv - update version to 1.3.8 - remove patches:icewm-gcc47.patch,icewm-x11.patch - add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch for new fate #313170 OBS-URL: https://build.opensuse.org/request/show/224110 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=27 2014-02-27 14:47:29 +00:00			`@@ -119,12 +119,12 @@ install-base: base`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=1 2007-04-20 21:31:14 +00:00
			`install-docs: docs`
			`@echo ------------------------------------------`
			`- @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"`
			`- @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"`
			`+ @rm -fr "$(DESTDIR)$(DOCDIR)/icewm"`
			`+ @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm"`
			`@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"`
			`- @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"`
			`- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"`
			`- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"`
			`+ @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm"`
			`+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm"`
			`+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"`
			`@echo ------------------------------------------`

			`install-nls: nls`
Accepting request 224110 from home:scarabeus_iv - update version to 1.3.8 - remove patches:icewm-gcc47.patch,icewm-x11.patch - add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch for new fate #313170 OBS-URL: https://build.opensuse.org/request/show/224110 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=27 2014-02-27 14:47:29 +00:00			`diff --git src/Makefile.in src/Makefile.in`
			`index 73f015b..46aea83 100644`
			`--- src/Makefile.in`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=1 2007-04-20 21:31:14 +00:00			`+++ src/Makefile.in`
Accepting request 34218 from X11:windowmanagers Copy from X11:windowmanagers/icewm based on submit request 34218 from user coolo OBS-URL: https://build.opensuse.org/request/show/34218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=18 2010-03-07 09:57:46 +00:00			`@@ -32,7 +32,7 @@ DEFS = @DEFS@ \`
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=1 2007-04-20 21:31:14 +00:00			`-DICEWMBGEXE='"icewmbg$(EXEEXT)"' \`
			`-DICESMEXE='"icewm-session$(EXEEXT)"' \`
			`-DICEHELPEXE='"icehelp$(EXEEXT)"' \`
			`- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'`
			`+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'`

Accepting request 34218 from X11:windowmanagers Copy from X11:windowmanagers/icewm based on submit request 34218 from user coolo OBS-URL: https://build.opensuse.org/request/show/34218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icewm?expand=0&rev=18 2010-03-07 09:57:46 +00:00			CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
Accepting request 224110 from home:scarabeus_iv - update version to 1.3.8 - remove patches:icewm-gcc47.patch,icewm-x11.patch - add two new patches:icewm-1.3.8-enable-guievents.patch,icewm-susemenu.patch for new fate #313170 OBS-URL: https://build.opensuse.org/request/show/224110 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=27 2014-02-27 14:47:29 +00:00			@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ `pkg-config fontconfig --cflags`