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`