diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2006-06-19 15:30:00 +0000 |
|---|---|---|
| committer | Luotao Fu <l.fu@pengutronix.de> | 2006-06-19 15:30:00 +0000 |
| commit | 5450510229001c331e13e7cf783b89208c765874 (patch) | |
| tree | 28b4c6b1c9f2f88fe6437c9ed8169766cab4dc11 /rules/xorg-lib-Xaw.make | |
| parent | 75f43a7cb50cb0eff7ea0c27ef72896fbe2528c4 (diff) | |
| download | ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.gz ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.xz | |
merging to xorg7.1
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5822 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/xorg-lib-Xaw.make')
| -rw-r--r-- | rules/xorg-lib-Xaw.make | 62 |
1 files changed, 39 insertions, 23 deletions
diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make index 8bed05c04..87957b918 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.1 -XORG_LIB_XAW := libXaw-X11R7.0-$(XORG_LIB_XAW_VERSION) +XORG_LIB_XAW_VERSION := 1.0.2 +XORG_LIB_XAW := libXaw-X11R7.1-$(XORG_LIB_XAW_VERSION) XORG_LIB_XAW_SUFFIX := tar.bz2 -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_URL := $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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,37 +114,53 @@ $(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_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.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)/libXaw6.so) - @$(call install_link, xorg-lib-Xaw, \ - libXaw6.so.6.0.1, \ - $(XORG_LIBDIR)/libXaw.so.6) + #@$(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_link, xorg-lib-Xaw, \ + # libXaw7.so.7.0.0, \ + # $(XORG_LIBDIR)/libXaw7.so.7) + + #@$(call install_link, xorg-lib-Xaw, \ + # libXaw7.so.7.0.0, \ + # $(XORG_LIBDIR)/libXaw7.so) + + #@$(call install_link, xorg-lib-Xaw, \ + # libXaw7.so.7.0.0, \ + # $(XORG_LIBDIR)/libXaw.so.7) @$(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) + $(XORG_LIB_XAW_DIR)/src/.libs/libXaw8.so.8.0.0, \ + $(XORG_LIBDIR)/libXaw8.so.8.0.0) @$(call install_link, xorg-lib-Xaw, \ - libXaw7.so.7.0.0, \ - $(XORG_LIBDIR)/libXaw7.so.7) + libXaw8.so.8.0.0, \ + $(XORG_LIBDIR)/libXaw8.so.8) @$(call install_link, xorg-lib-Xaw, \ - libXaw7.so.7.0.0, \ - $(XORG_LIBDIR)/libXaw7.so) + libXaw8.so.8.0.0, \ + $(XORG_LIBDIR)/libXaw8.so) @$(call install_link, xorg-lib-Xaw, \ - libXaw7.so.7.0.0, \ - $(XORG_LIBDIR)/libXaw.so.7) + libXaw8.so.8.0.0, \ + $(XORG_LIBDIR)/libXaw.so.8) @$(call install_finish, xorg-lib-Xaw) |