Author: branden
Date: 2003-09-18 02:48:43 -0500 (Thu, 18 Sep 2003)
New Revision: 549
Added:
branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
debian/patches/068_fix_InstallAppDefFiles_screwage.diff: always define the
Imake symbol "InstallAppDefFiles" to "YES" on Debian systems; shuts up an
extremely annoying build-time warning
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-18 07:43:43 UTC (rev 548)
+++ branches/4.3.0/sid/debian/changelog 2003-09-18 07:48:43 UTC (rev 549)
@@ -155,8 +155,12 @@
xc/lib/X11/Wrap.c and Wraphelp.c were being linked over from lib/Xdmcap
but lib/Xdmcp/Wrap.h was not
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 18 Sep 2003 02:41:37 -0500
+ * debian/patches/068_fix_InstallAppDefFiles_screwage.diff: always define the
+ Imake symbol "InstallAppDefFiles" to "YES" on Debian systems; shuts up an
+ extremely annoying build-time warning
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 18 Sep 2003 02:47:04 -0500
+
xfree86 (4.3.0-0pre1v1) experimental; urgency=low
* new upstream release
Added:
branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
2003-09-18 07:43:43 UTC (rev 548)
+++ branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
2003-09-18 07:48:43 UTC (rev 549)
@@ -0,0 +1,32 @@
+$Id$
+
+This patch by Branden Robinson. Apparently, in 4.3.0, InstallAppDefFiles is
+not defined by default anymore (it was in 4.2.1).
+
+It might make more sense to just unconditionally redefine
+InstallAppDefaultsLong(), but an impact analysis of that hasn't been done
+yet.
+
+--- xc/config/cf/linux.cf~ 2003-09-18 01:28:10.000000000 -0500
++++ xc/config/cf/linux.cf 2003-09-18 01:28:26.000000000 -0500
+@@ -110,13 +110,16 @@
+ /* # define JoystickSupport YES */
+ # define XAppLoadDir EtcX11Directory/app-defaults
+ # define XFileSearchPathDefault
Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
++# define InstallAppDefFiles YES
+ /* the relative symlink created by this rule causes problems for us */
+-# if InstallAppDefFiles
+-# define InstallAppDefaultsLong(file,class) @@\
++# ifdef InstallAppDefFiles
++# if InstallAppDefFiles
++# define InstallAppDefaultsLong(file,class) @@\
+ InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
+-# else
+-# define InstallAppDefaultsLong(file,class) @@\
++# else
++# define InstallAppDefaultsLong(file,class) @@\
+
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
++# endif
+ # endif /* InstallAppDefFiles */
+ # define SharedLibXdmGreet NO
+ # define LinkGLToUsrInclude NO
Property changes on:
branches/4.3.0/sid/debian/patches/068_fix_InstallAppDefFiles_screwage.diff
___________________________________________________________________
Name: svn:keywords
+ Id
