mirror of
https://git.freebsd.org/ports.git
synced 2025-06-11 07:40:40 -04:00
ca88d41854
A few critical patches got merged upstream, a few new were required to maintain LibreSSL support and fix other new issues. Note that slice2py moved from devel/py-ice to devel/ice. Approved by: mentors (implicit)
50 lines
1.5 KiB
Text
50 lines
1.5 KiB
Text
--- config/Make.common.rules.orig 2016-10-05 16:59:08.000000000 +0200
|
|
+++ config/Make.common.rules 2016-10-11 22:39:50.774367911 +0200
|
|
@@ -19,7 +19,8 @@
|
|
SHORT_VERSION = 3.6
|
|
SOVERSION = 36
|
|
|
|
-INSTALL = cp -fp
|
|
+override DESTDIR =
|
|
+INSTALL = %%INSTALL_PROGRAM%%
|
|
INSTALL_PROGRAM = ${INSTALL}
|
|
INSTALL_LIBRARY = ${INSTALL}
|
|
INSTALL_DATA = ${INSTALL}
|
|
@@ -53,13 +54,13 @@
|
|
#
|
|
# usr_dir_install means we want to install with a /usr style layout.
|
|
#
|
|
-ifeq ($(prefix), /usr)
|
|
- usr_dir_install = 1
|
|
-endif
|
|
-
|
|
-ifeq ($(prefix), /usr/local)
|
|
- usr_dir_install = 1
|
|
-endif
|
|
+#ifeq ($(prefix), /usr)
|
|
+# 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 @@
|
|
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
|