summaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk24/files/patch-ac
blob: 299113130bd814441fa78b3ade4c71b35f0cd469 (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
81
82
83
84
85
86
87
88
89
$FreeBSD$

--- Makefile.in.orig	Fri Jan  4 17:47:57 2002
+++ Makefile.in	Mon Sep  9 15:55:57 2002
@@ -342,17 +342,13 @@
 
 $(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@
 	cd $(build_libdir) \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
-		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@
+		&& $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
 
 $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@
 	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@
 	cd $(build_libdir) \
-		&& $(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_LINK1_GL@
 
 $(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
 
@@ -382,17 +378,13 @@
 
 CREATE_INSTALLED_LINKS: preinstall
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	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_LINK1@
 
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
 	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2_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_LINK1_GL@
 
 afminstall: preinstall
 	$(INSTALL) -d $(datadir)
@@ -404,7 +396,7 @@
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config
+preinstall:
 	@echo " "
 	@echo " Installing wxWindows..."
 	@echo " "
@@ -421,11 +413,8 @@
 	@# import livraru name
 	@if test "@TOOLKIT_DIR@" = "msw" -a "@WX_LIBRARY_NAME_STATIC@" != "@WX_TARGET_LIBRARY@"; then $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_NAME_STATIC@ $(libdir)/@WX_LIBRARY_NAME_STATIC@; fi
 
-	$(INSTALL) -d $(libdir)/wx
-	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
-	$(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+	$(INSTALL) -d $(prefix)/include/wx
+	$(INSTALL_DATA) $(top_builddir)/lib/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(prefix)/include/wx/setup.h
 
 	$(INSTALL) -d $(includedir)/wx
 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
@@ -449,7 +438,7 @@
 	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done
 
-preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
+preinstall_gl:
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
@@ -476,11 +465,9 @@
 	@echo " Removing library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK2@
 	@echo " Removing GL library..."
 	@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
 	@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	@$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
 	@echo " Removing helper files..."
 	@$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 	@$(RM) $(bindir)/wx-config