Author: dnusinow Date: 2005-08-31 07:56:50 -0500 (Wed, 31 Aug 2005) New Revision: 570
Modified: trunk/debian/rules Log: Reorder SPECIAL_DEPENDS assignment in debian/rules so as to properly match i386 Modified: trunk/debian/rules =================================================================== --- trunk/debian/rules 2005-08-30 15:28:54 UTC (rev 569) +++ trunk/debian/rules 2005-08-31 12:56:50 UTC (rev 570) @@ -101,14 +101,16 @@ # # $(XWSD_SPECIAL_DEPENDS) is used to add packages to the dependencies of # x-window-system-dev. +# This first line must go first because findstring will match i386 subarches as # i386, so we must make sure it sees i386 last to set its variables correctly +ifneq (,$(findstring $(ARCH),arm hppa hurd-i386 m68k mips mipsel netbsd-i386 sh3 sh4)) +XWSC_SPECIAL_DEPENDS="xserver-xorg, " +endif + ifneq (,$(findstring $(ARCH),alpha amd64 i386 ia64 kfreebsd-i386 powerpc sparc)) XWSC_SPECIAL_DEPENDS="xserver-xorg, xlibmesa-dri, " XWSD_SPECIAL_DEPENDS="xlibosmesa4-dbg, xlibosmesa-dev, " endif -ifneq (,$(findstring $(ARCH),arm hppa hurd-i386 m68k mips mipsel netbsd-i386 sh3 sh4)) -XWSC_SPECIAL_DEPENDS="xserver-xorg, " -endif ifneq (,$(findstring $(ARCH),s390)) NOT_BUILDING_XORG_X_SERVER=1 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
