summaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-config-Make.common.rules
blob: 55e8290fc036bf648f1a6a4e2d6e4253eb4aa7ae (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
--- config/Make.common.rules.orig	2019-08-12 19:54:18 UTC
+++ config/Make.common.rules
@@ -19,7 +19,8 @@ VERSION         = 3.6.5
 SHORT_VERSION   = 3.6
 SOVERSION	= 36
 
-INSTALL		= cp -fp
+override DESTDIR	=
+INSTALL		= %%INSTALL_PROGRAM%%
 INSTALL_PROGRAM	= ${INSTALL}
 INSTALL_LIBRARY	= ${INSTALL}
 INSTALL_DATA	= ${INSTALL}
@@ -53,14 +54,14 @@ endif
 #
 # usr_dir_install means we want to install with a /usr style layout.
 #
-ifeq ($(prefix), /usr)
-    usr_dir_install = 1
-endif
+#ifeq ($(prefix), /usr)
+#    usr_dir_install = 1
+#endif
+#
+#ifeq ($(prefix), /usr/local)
+#    usr_dir_install = 1
+#endif
 
-ifeq ($(prefix), /usr/local)
-    usr_dir_install = 1
-endif
-
 #
 # A /usr style layout can be forced by setting USR_DIR_INSTALL=yes.
 #
@@ -507,12 +508,12 @@ install-common::
 		fi ; \
 	fi
 
-	@if test ! -f $(DESTDIR)$(install_docdir)/ICE_LICENSE$(TEXT_EXTENSION) ; \
+	@if test ! -f $(DESTDIR)$(install_slicedir)/ICE_LICENSE$(TEXT_EXTENSION) ; \
 	then \
-		$(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \
+		$(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
 	fi
 
-	@if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \
+	@if test ! -f $(DESTDIR)$(install_slicedir)/LICENSE$(TEXT_EXTENSION) ; \
 	then \
-		$(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \
+		$(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
 	fi