Fix XPMINCLUDE, as XFree86-3.3's INCDIR doesn't include the trailing

"X11" anymore.  By the way, if you see how this patch changed, you'll
know why I hate context diffs -- it would have been much easier to fix
the patch (I could have just hand-edited one line) if it were a
unified diff....
This commit is contained in:
Satoshi Asami 1997-06-19 05:26:20 +00:00
parent 3bfc47f3b0
commit 5a723b690b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=7002

View file

@ -49,16 +49,24 @@
# paths for installation in user's home-directory.
***************
*** 55,60 ****
--- 55,62 ----
XPMLIB = -L$(USRLIBDIR) -lXpm
XPMINCLUDE = -I $(INCDIR)
*** 53,59 ****
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I $(INCDIR)
+ CFLAGS += -DNO_CUSERID
+
# *****************************************************************************
# I hope you don't need to change anything below this point
--- 53,61 ----
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I$(INCDIR)/X11
!
! CFLAGS += -DNO_CUSERID
# *****************************************************************************
# I hope you don't need to change anything below this point
***************
*** 181,188 ****
chmod 755 $(XPATLIBDIR)/$$f; \