From 21c2d9ce94c079b799832eb6ff1bea9ccc0d3fbf Mon Sep 17 00:00:00 2001 From: Luotao Fu Date: Fri, 16 Jun 2006 11:14:44 +0000 Subject: revert change git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5801 33e552b5-05e3-0310-8538-816dae2090ed --- rules/xorg-lib-Xaw.make | 62 ++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) (limited to 'rules/xorg-lib-Xaw.make') diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make index e6f2bc97f..8bed05c04 100644 --- a/rules/xorg-lib-Xaw.make +++ b/rules/xorg-lib-Xaw.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XAW) += xorg-lib-Xaw # # Paths and names # -XORG_LIB_XAW_VERSION := 1.0.2 -XORG_LIB_XAW := libXaw-X11R7.1-$(XORG_LIB_XAW_VERSION) +XORG_LIB_XAW_VERSION := 1.0.1 +XORG_LIB_XAW := libXaw-X11R7.0-$(XORG_LIB_XAW_VERSION) XORG_LIB_XAW_SUFFIX := tar.bz2 -XORG_LIB_XAW_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) +XORG_LIB_XAW_URL := ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) XORG_LIB_XAW_SOURCE := $(SRCDIR)/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX) XORG_LIB_XAW_DIR := $(BUILDDIR)/$(XORG_LIB_XAW) @@ -114,53 +114,37 @@ $(STATEDIR)/xorg-lib-Xaw.targetinstall: $(xorg-lib-Xaw_targetinstall_deps_defaul @$(call install_fixup, xorg-lib-Xaw,DEPENDS,) @$(call install_fixup, xorg-lib-Xaw,DESCRIPTION,missing) - #@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \ - # $(XORG_LIB_XAW_DIR)/src/.libs/libXaw6.so.6.0.1, \ - # $(XORG_LIBDIR)/libXaw6.so.6.0.1) - - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw6.so.6.0.1, \ - # $(XORG_LIBDIR)/libXaw6.so.6) - - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw6.so.6.0.1, \ - # $(XORG_LIBDIR)/libXaw6.so) - - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw6.so.6.0.1, \ - # $(XORG_LIBDIR)/libXaw.so.6) - - #@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \ - # $(XORG_LIB_XAW_DIR)/src/.libs/libXaw7.so.7.0.0, \ - # $(XORG_LIBDIR)/libXaw7.so.7.0.0) + @$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \ + $(XORG_LIB_XAW_DIR)/src/.libs/libXaw6.so.6.0.1, \ + $(XORG_LIBDIR)/libXaw6.so.6.0.1) - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw7.so.7.0.0, \ - # $(XORG_LIBDIR)/libXaw7.so.7) + @$(call install_link, xorg-lib-Xaw, \ + libXaw6.so.6.0.1, \ + $(XORG_LIBDIR)/libXaw6.so.6) - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw7.so.7.0.0, \ - # $(XORG_LIBDIR)/libXaw7.so) + @$(call install_link, xorg-lib-Xaw, \ + libXaw6.so.6.0.1, \ + $(XORG_LIBDIR)/libXaw6.so) - #@$(call install_link, xorg-lib-Xaw, \ - # libXaw7.so.7.0.0, \ - # $(XORG_LIBDIR)/libXaw.so.7) + @$(call install_link, xorg-lib-Xaw, \ + libXaw6.so.6.0.1, \ + $(XORG_LIBDIR)/libXaw.so.6) @$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \ - $(XORG_LIB_XAW_DIR)/src/.libs/libXaw8.so.8.0.0, \ - $(XORG_LIBDIR)/libXaw8.so.8.0.0) + $(XORG_LIB_XAW_DIR)/src/.libs/libXaw7.so.7.0.0, \ + $(XORG_LIBDIR)/libXaw7.so.7.0.0) @$(call install_link, xorg-lib-Xaw, \ - libXaw8.so.8.0.0, \ - $(XORG_LIBDIR)/libXaw8.so.8) + libXaw7.so.7.0.0, \ + $(XORG_LIBDIR)/libXaw7.so.7) @$(call install_link, xorg-lib-Xaw, \ - libXaw8.so.8.0.0, \ - $(XORG_LIBDIR)/libXaw8.so) + libXaw7.so.7.0.0, \ + $(XORG_LIBDIR)/libXaw7.so) @$(call install_link, xorg-lib-Xaw, \ - libXaw8.so.8.0.0, \ - $(XORG_LIBDIR)/libXaw.so.8) + libXaw7.so.7.0.0, \ + $(XORG_LIBDIR)/libXaw.so.7) @$(call install_finish, xorg-lib-Xaw) -- cgit v1.2.3