forked from Lainports/opnsense-ports
63 lines
1.9 KiB
Text
63 lines
1.9 KiB
Text
--- config/Make.common.rules.orig 2015-06-23 15:30:20.000000000 +0000
|
|
+++ config/Make.common.rules 2015-06-27 23:55:59.468049240 +0000
|
|
@@ -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}
|
|
@@ -49,13 +50,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.
|
|
@@ -461,20 +463,24 @@
|
|
then \
|
|
ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \
|
|
fi ; \
|
|
+ fi
|
|
+
|
|
+ @if test -d $(DESTDIR)$(install_slicedir) ; \
|
|
+ then \
|
|
cd $(top_srcdir)/../slice ; \
|
|
for subdir in * ; \
|
|
do \
|
|
echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \
|
|
cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \
|
|
done ; \
|
|
- 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
|