mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
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:
parent
3bfc47f3b0
commit
5a723b690b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=7002
@ -49,16 +49,24 @@
|
|||||||
|
|
||||||
# paths for installation in user's home-directory.
|
# paths for installation in user's home-directory.
|
||||||
***************
|
***************
|
||||||
*** 55,60 ****
|
*** 53,59 ****
|
||||||
--- 55,62 ----
|
|
||||||
XPMLIB = -L$(USRLIBDIR) -lXpm
|
# xpat2 needs to know where the xpm library resides (if needed)
|
||||||
XPMINCLUDE = -I $(INCDIR)
|
XPMLIB = -L$(USRLIBDIR) -lXpm
|
||||||
|
! XPMINCLUDE = -I $(INCDIR)
|
||||||
|
|
||||||
+ CFLAGS += -DNO_CUSERID
|
|
||||||
+
|
|
||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
# I hope you don't need to change anything below this point
|
# 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 ****
|
*** 181,188 ****
|
||||||
chmod 755 $(XPATLIBDIR)/$$f; \
|
chmod 755 $(XPATLIBDIR)/$$f; \
|
||||||
|
Loading…
Reference in New Issue
Block a user