Attachment #9458 for bug #17624

View | Details | Raw Unified | Return to bug 17624
Collapse All | Expand All





install-docs: docs
	@echo ------------------------------------------
	@rm -fr "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
	@echo ------------------------------------------

install-nls: nls





install-docs: docs
	@echo ------------------------------------------
	@rm -fr "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
	@echo ------------------------------------------

install-nls: nls

Lines 28-34 Link Here

(-)icewm-1.2.6/src/Makefile (-1 / +1 lines)
28	-DEXEEXT='"$(EXEEXT)"' \	28	-DEXEEXT='"$(EXEEXT)"' \
29	-DICEWMEXE='"icewm$(EXEEXT)"' \	29	-DICEWMEXE='"icewm$(EXEEXT)"' \
30	-DICEHELPEXE='"icehelp$(EXEEXT)"' \	30	-DICEHELPEXE='"icehelp$(EXEEXT)"' \
31	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'	31	-DICEHELPIDX='"$(DOCDIR)//icewm.html"'
32		32
33	CXXFLAGS = -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \	33	CXXFLAGS = -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \
34	-I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include # `fc-config --cflags`	34	-I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include # `fc-config --cflags`

Lines 28-34 Link Here

(-)icewm-1.2.6/src/Makefile.in (-1 / +1 lines)
28	-DEXEEXT='"$(EXEEXT)"' \	28	-DEXEEXT='"$(EXEEXT)"' \
29	-DICEWMEXE='"icewm$(EXEEXT)"' \	29	-DICEWMEXE='"icewm$(EXEEXT)"' \
30	-DICEHELPEXE='"icehelp$(EXEEXT)"' \	30	-DICEHELPEXE='"icehelp$(EXEEXT)"' \
31	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'	31	-DICEHELPIDX='"$(DOCDIR)//icewm.html"'
32		32
33	CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \	33	CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
34	@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`	34	@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`

Lines 13-21 Link Here

(-)icewm-1.2.6/src/wmclient.h (-3 / +4 lines)
13		13
14	#ifndef __YIMP_XUTIL__	14	#ifndef __YIMP_XUTIL__
15	//!!! remove these if possible	15	//!!! remove these if possible
16	typedef struct XWMHints;	16	//typedef struct XWMHints;
17	typedef struct XSizeHints;	17	//typedef struct XSizeHints;
18	typedef struct XClassHint;	18	//typedef struct XClassHint;
		19	#include <X11/Xutil.h>
19	#endif	20	#endif
20		21
21	class ClientData {	22	class ClientData {

Return to bug 17624

Lines 110-121 Link Here

(-)icewm-1.2.6/Makefile (-5 / +5 lines)
110		110
111	install-docs: docs	111	install-docs: docs
112	@echo ------------------------------------------	112	@echo ------------------------------------------
113	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	113	@rm -fr "$(DESTDIR)$(DOCDIR)/"
114	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	114	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
115	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"	115	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
116	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	116	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
117	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	117	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
118	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	118	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
119	@echo ------------------------------------------	119	@echo ------------------------------------------
120		120
121	install-nls: nls	121	install-nls: nls

Lines 110-121 Link Here

(-)icewm-1.2.6/Makefile.in (-5 / +5 lines)
110		110
111	install-docs: docs	111	install-docs: docs
112	@echo ------------------------------------------	112	@echo ------------------------------------------
113	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	113	@rm -fr "$(DESTDIR)$(DOCDIR)/"
114	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	114	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
115	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"	115	@echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
116	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	116	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
117	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	117	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
118	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"	118	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
119	@echo ------------------------------------------	119	@echo ------------------------------------------
120		120
121	install-nls: nls	121	install-nls: nls