summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rules/xorg-lib-ICE.make12
-rw-r--r--rules/xorg-lib-SM.make12
-rw-r--r--rules/xorg-lib-X11.make6
-rw-r--r--rules/xorg-lib-Xau.make6
-rw-r--r--rules/xorg-lib-Xdmcp.make6
-rw-r--r--rules/xorg-lib-Xext.make6
-rw-r--r--rules/xorg-lib-Xfont.make6
-rw-r--r--rules/xorg-lib-Xmu.make12
-rw-r--r--rules/xorg-lib-Xt.make12
-rw-r--r--rules/xorg-lib-fontenc.make6
-rw-r--r--rules/xorg-server.make1
11 files changed, 58 insertions, 27 deletions
diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make
index 2d494dae2..a4d3a70ff 100644
--- a/rules/xorg-lib-ICE.make
+++ b/rules/xorg-lib-ICE.make
@@ -115,7 +115,17 @@ $(STATEDIR)/xorg-lib-ICE.targetinstall: $(xorg-lib-ICE_targetinstall_deps_defaul
@$(call install_fixup,DEPENDS,)
@$(call install_fixup,DESCRIPTION,missing)
-#FIXME
+ @$(call install_copy, 0, 0, 0644, \
+ $(XORG_LIB_ICE_DIR)/src/.libs/libICE.so.6.3.0, \
+ $(XORG_LIBDIR)/libICE.so.6.3.0)
+
+ @$(call install_link, \
+ libICE.so.6.3.0, \
+ $(XORG_LIBDIR)/libICE.so.6)
+
+ @$(call install_link, \
+ libICE.so.6.3.0, \
+ $(XORG_LIBDIR)/libICE.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make
index cc77769eb..ae4b5acee 100644
--- a/rules/xorg-lib-SM.make
+++ b/rules/xorg-lib-SM.make
@@ -115,7 +115,17 @@ $(STATEDIR)/xorg-lib-SM.targetinstall: $(xorg-lib-SM_targetinstall_deps_default)
@$(call install_fixup,DEPENDS,)
@$(call install_fixup,DESCRIPTION,missing)
-#FIXME
+ @$(call install_copy, 0, 0, 0644, \
+ $(XORG_LIB_SM_DIR)/src/.libs/libSM.so.6.0.0, \
+ $(XORG_LIBDIR)/libSM.so.6.0.0)
+
+ @$(call install_link, \
+ libSM.so.6.0.0, \
+ $(XORG_LIBDIR)/libSM.so.6)
+
+ @$(call install_link, \
+ libSM.so.6.0.0, \
+ $(XORG_LIBDIR)/libSM.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index 23060bd9c..20cdc7180 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -119,15 +119,15 @@ $(STATEDIR)/xorg-lib-X11.targetinstall: $(xorg-lib-X11_targetinstall_deps_defaul
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_X11_DIR)/src/.libs/libX11.so.6.2.0, \
- /usr/X11R6/lib/libX11.so.6.2.0)
+ $(XORG_LIBDIR)/libX11.so.6.2.0)
@$(call install_link, \
libX11.so.6.2.0, \
- /usr/X11R6/lib/libX11.so.6)
+ $(XORG_LIBDIR)/libX11.so.6)
@$(call install_link, \
libX11.so.6.2.0, \
- /usr/X11R6/lib/libX11.so)
+ $(XORG_LIBDIR)/libX11.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make
index 9da7389c2..ca72f855d 100644
--- a/rules/xorg-lib-Xau.make
+++ b/rules/xorg-lib-Xau.make
@@ -117,15 +117,15 @@ $(STATEDIR)/xorg-lib-Xau.targetinstall: $(xorg-lib-Xau_targetinstall_deps_defaul
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XAU_DIR)/.libs/libXau.so.6.0.0, \
- /usr/X11R6/lib/libXau.so.6.0.0)
+ $(XORG_LIBDIR)/libXau.so.6.0.0)
@$(call install_link, \
libXau.so.6.0.0, \
- /usr/X11R6/lib/libXau.so.6)
+ $(XORG_LIBDIR)/libXau.so.6)
@$(call install_link, \
libXau.so.6.0.0, \
- /usr/X11R6/lib/libXau.so)
+ $(XORG_LIBDIR)/libXau.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make
index 0105c9d54..129124a08 100644
--- a/rules/xorg-lib-Xdmcp.make
+++ b/rules/xorg-lib-Xdmcp.make
@@ -117,15 +117,15 @@ $(STATEDIR)/xorg-lib-Xdmcp.targetinstall: $(xorg-lib-Xdmcp_targetinstall_deps_de
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XDMCP_DIR)/.libs/libXdmcp.so.6.0.0, \
- /usr/X11R6/lib/libXdmcp.so.6.0.0)
+ $(XORG_LIBDIR)/libXdmcp.so.6.0.0)
@$(call install_link, \
libXdmcp.so.6.0.0, \
- /usr/X11R6/lib/libXdmcp.so.6)
+ $(XORG_LIBDIR)/libXdmcp.so.6)
@$(call install_link, \
libXdmcp.so.6.0.0, \
- /usr/X11R6/lib/libXdmcp.so)
+ $(XORG_LIBDIR)/libXdmcp.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index fdfd7cdd3..5ce26625d 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -119,15 +119,15 @@ $(STATEDIR)/xorg-lib-Xext.targetinstall: $(xorg-lib-Xext_targetinstall_deps_defa
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XEXT_DIR)/src/.libs/libXext.so.6.4.0, \
- /usr/X11R6/lib/libXext.so.6.4.0)
+ $(XORG_LIBDIR)/libXext.so.6.4.0)
@$(call install_link, \
libXext.so.6.4.0, \
- /usr/X11R6/lib/libXext.so.6)
+ $(XORG_LIBDIR)/libXext.so.6)
@$(call install_link, \
libXext.so.6.4.0, \
- /usr/X11R6/lib/libXext.so)
+ $(XORG_LIBDIR)/libXext.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index d254f4b03..dc48de64f 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -117,15 +117,15 @@ $(STATEDIR)/xorg-lib-Xfont.targetinstall: $(xorg-lib-Xfont_targetinstall_deps_de
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XFONT_DIR)/src/.libs/libXfont.so.1.4.1, \
- /usr/X11R6/lib/libXfont.so.1.4.1)
+ $(XORG_LIBDIR)/libXfont.so.1.4.1)
@$(call install_link, \
libXfont.so.1.4.1, \
- /usr/X11R6/lib/libXfont.so.1)
+ $(XORG_LIBDIR)/libXfont.so.1)
@$(call install_link, \
libXfont.so.1.4.1, \
- /usr/X11R6/lib/libXfont.so)
+ $(XORG_LIBDIR)/libXfont.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make
index 13e1969f9..ec27ef00b 100644
--- a/rules/xorg-lib-Xmu.make
+++ b/rules/xorg-lib-Xmu.make
@@ -117,27 +117,27 @@ $(STATEDIR)/xorg-lib-Xmu.targetinstall: $(xorg-lib-Xmu_targetinstall_deps_defaul
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XMU_DIR)/src/.libs/libXmu.so.6.2.0, \
- /usr/X11R6/lib/libXmu.so.6.2.0)
+ $(XORG_LIBDIR)/libXmu.so.6.2.0)
@$(call install_link, \
libXmu.so.6.2.0, \
- /usr/X11R6/lib/libXmu.so.6)
+ $(XORG_LIBDIR)/libXmu.so.6)
@$(call install_link, \
libXmu.so.6.2.0, \
- /usr/X11R6/lib/libXmu.so)
+ $(XORG_LIBDIR)/libXmu.so)
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_XMU_DIR)/src/.libs/libXmuu.so.1.0.0, \
- /usr/X11R6/lib/libXmuu.so.1.0.0)
+ $(XORG_LIBDIR)/libXmuu.so.1.0.0)
@$(call install_link, \
libXmuu.so.1.0.0, \
- /usr/X11R6/lib/libXmuu.so.1)
+ $(XORG_LIBDIR)/libXmuu.so.1)
@$(call install_link, \
libXmuu.so.1.0.0, \
- /usr/X11R6/lib/libXmuu.so)
+ $(XORG_LIBDIR)/libXmuu.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 0e141e2dd..6f3c806eb 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -118,7 +118,17 @@ $(STATEDIR)/xorg-lib-Xt.targetinstall: $(xorg-lib-Xt_targetinstall_deps_default)
@$(call install_fixup,DEPENDS,)
@$(call install_fixup,DESCRIPTION,missing)
-#FIXME
+ @$(call install_copy, 0, 0, 0644, \
+ $(XORG_LIB_XT_DIR)/src/.libs/libXt.so.6.0.0, \
+ $(XORG_LIBDIR)/libXt.so.6.0.0)
+
+ @$(call install_link, \
+ libXt.so.6.0.0, \
+ $(XORG_LIBDIR)/libXt.so.6)
+
+ @$(call install_link, \
+ libXt.so.6.0.0, \
+ $(XORG_LIBDIR)/libXt.so)
@$(call install_finish)
diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make
index dd20a33bc..10b94082a 100644
--- a/rules/xorg-lib-fontenc.make
+++ b/rules/xorg-lib-fontenc.make
@@ -117,15 +117,15 @@ $(STATEDIR)/xorg-lib-fontenc.targetinstall: $(xorg-lib-fontenc_targetinstall_dep
@$(call install_copy, 0, 0, 0644, \
$(XORG_LIB_FONTENC_DIR)/src/.libs/libfontenc.so.1.0.0, \
- /usr/X11R6/lib/libfontenc.so.1.0.0)
+ $(XORG_LIBDIR)/libfontenc.so.1.0.0)
@$(call install_link, \
libfontenc.so.1.0.0, \
- /usr/X11R6/lib/libfontenc.so.1)
+ $(XORG_LIBDIR)/libfontenc.so.1)
@$(call install_link, \
libfontenc.so.1.0.0, \
- /usr/X11R6/lib/libfontenc.so)
+ $(XORG_LIBDIR)/libfontenc.so)
@$(call install_finish)
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 0349787e7..c089661e3 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -27,6 +27,7 @@ XORG_SERVER_DIR := $(BUILDDIR)/$(XORG_SERVER)
-include $(call package_depfile)
XORG_PREFIX = /usr
+XORG_LIBDIR = $(XORG_PREFIX)/lib
# ----------------------------------------------------------------------------
# Get
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 20:21:29 +0000