summaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk/files/patch-ac
blob: e9cf29bb39647d0d1dea8365dee433c843aaa515 (plain) (blame)
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
$FreeBSD$

--- Makefile.in.orig	Fri May 25 05:55:33 2001
+++ Makefile.in	Mon May 28 19:47:06 2001
@@ -379,39 +379,23 @@
 
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
-	@$(RM) ./lib/@WX_LIBRARY_LINK2@
-	@$(RM) ./lib/@WX_LIBRARY_LINK3@
 	cd lib \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
 
 CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
-	@$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
-	@$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
 	cd lib \
-		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
+		&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
 
 CREATE_INSTALLED_LINKS: preinstall
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK3@
 	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
 
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	cd $(libdir) \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
-		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
+		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
 
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
@@ -461,11 +445,11 @@
 	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
 	$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
 
-	$(INSTALL) -d $(libdir)/wx
-	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/wx
-	$(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@
-	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
+#	$(INSTALL) -d $(libdir)/wx
+#	$(INSTALL) -d $(libdir)/wx/include
+	$(INSTALL) -d $(prefix)/include/wx
+	$(INSTALL) -d $(prefix)/include/wx/@TOOLKIT_NAME@
+	$(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(prefix)/include/wx/@TOOLKIT_NAME@/setup.h
 
 	$(INSTALL) -d $(includedir)/wx
 	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
@@ -513,13 +497,9 @@
 	@echo " Removing library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK3@
 	@echo " Removing GL library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
 	@echo " Removing helper files..."
 	@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
 	@$(RM) $(bindir)/wx-config