blob: 046333627de731abb96cb40c33ce0c47296498ad (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
diff -urN icewm-1.2.6/Makefile icewm-1.2.6-new/Makefile
--- icewm-1.2.6/Makefile Thu Dec 26 12:05:47 2002
+++ icewm-1.2.6-new/Makefile Sat Dec 28 18:12:30 2002
@@ -110,12 +110,12 @@
install-docs: docs
@echo ------------------------------------------
- @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
- @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+ @rm -fr "$(DESTDIR)$(DOCDIR)/"
+ @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
@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)/"
+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
@echo ------------------------------------------
install-nls: nls
diff -urN icewm-1.2.6/Makefile.in icewm-1.2.6-new/Makefile.in
--- icewm-1.2.6/Makefile.in Thu Dec 26 12:05:29 2002
+++ icewm-1.2.6-new/Makefile.in Sat Dec 28 18:12:30 2002
@@ -110,12 +110,12 @@
install-docs: docs
@echo ------------------------------------------
- @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
- @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+ @rm -fr "$(DESTDIR)$(DOCDIR)/"
+ @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
@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)/"
+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
+ @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
@echo ------------------------------------------
install-nls: nls
diff -urN icewm-1.2.6/src/Makefile icewm-1.2.6-new/src/Makefile
--- icewm-1.2.6/src/Makefile Thu Dec 26 12:05:48 2002
+++ icewm-1.2.6-new/src/Makefile Sat Dec 28 18:12:30 2002
@@ -28,7 +28,7 @@
-DEXEEXT='"$(EXEEXT)"' \
-DICEWMEXE='"icewm$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+ -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
CXXFLAGS = -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \
-I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include # `fc-config --cflags`
diff -urN icewm-1.2.6/src/Makefile.in icewm-1.2.6-new/src/Makefile.in
--- icewm-1.2.6/src/Makefile.in Thu Dec 26 12:05:30 2002
+++ icewm-1.2.6-new/src/Makefile.in Sat Dec 28 18:12:30 2002
@@ -28,7 +28,7 @@
-DEXEEXT='"$(EXEEXT)"' \
-DICEWMEXE='"icewm$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+ -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
diff -urN icewm-1.2.6/src/wmclient.h icewm-1.2.6-new/src/wmclient.h
--- icewm-1.2.6/src/wmclient.h Thu Dec 26 12:05:30 2002
+++ icewm-1.2.6-new/src/wmclient.h Sat Dec 28 18:12:38 2002
@@ -13,9 +13,10 @@
#ifndef __YIMP_XUTIL__
//!!! remove these if possible
-typedef struct XWMHints;
-typedef struct XSizeHints;
-typedef struct XClassHint;
+//typedef struct XWMHints;
+//typedef struct XSizeHints;
+//typedef struct XClassHint;
+#include <X11/Xutil.h>
#endif
class ClientData {
|
GitWeb