forked from Lainports/freebsd-ports
eb482bc128
By some stupidity of autotools, spacing for a sed regexp used to generate Xresources gets broken, and the sed command doen't match as it should. This results in an Xresources file with an extra '#endif /* XPM */', which breaks the file. Patch Makefile.in to fix the regexp and have Xresources generated properly. PR: 244404 Reported by: olgeni MFH: 2020Q1
13 lines
659 B
Text
13 lines
659 B
Text
--- config/Makefile.in.orig 2019-03-02 22:06:24 UTC
|
|
+++ config/Makefile.in
|
|
@@ -391,8 +391,8 @@ EXTRA_DIST = Xservers.ws.in Xservers.fs \
|
|
@USE_XPM_FALSE@XPM_SED_FLAGS = -e '/ifdef XPM/,/endif \/\* XPM \*\//d'
|
|
|
|
# Defines used when sed'ing config files to replace settings in the files
|
|
-@USE_XPM_TRUE@XPM_SED_FLAGS = -e '/ifdef XPM/d' -e '/endif \/\* XPM \
|
|
-@USE_XPM_TRUE@ \*\//d' -e 's|BITMAPDIR|$(XDM_PIXMAPDIR)|' -e \
|
|
+@USE_XPM_TRUE@XPM_SED_FLAGS = -e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
|
|
+@USE_XPM_TRUE@ -e 's|BITMAPDIR|$(XDM_PIXMAPDIR)|' -e \
|
|
@USE_XPM_TRUE@ 's|XDM_PIXMAP|$(XDM_PIXMAP)|' -e \
|
|
@USE_XPM_TRUE@ 's|XDM_BWPIXMAP|$(XDM_BWPIXMAP)|'
|
|
|