diff options
Diffstat (limited to 'x11/libX11/patches/patch-ag')
| -rw-r--r-- | x11/libX11/patches/patch-ag | 473 |
1 files changed, 473 insertions, 0 deletions
diff --git a/x11/libX11/patches/patch-ag b/x11/libX11/patches/patch-ag new file mode 100644 index 00000000000..ff63c291520 --- /dev/null +++ b/x11/libX11/patches/patch-ag @@ -0,0 +1,473 @@ +$NetBSD: patch-ag,v 1.1 2007/08/01 16:48:42 joerg Exp $ + +--- src/Makefile.in.orig 2007-06-04 06:44:50.000000000 +0200 ++++ src/Makefile.in +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -15,15 +15,11 @@ + @SET_MAKE@ + + +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = .. + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c + install_sh_SCRIPT = $(install_sh) -c +@@ -79,17 +75,13 @@ LTLIBRARIES = $(lib_LTLIBRARIES) + am__libX11_xcb_la_SOURCES_DIST = x11_xcb.c Xxcbint.h + @XCB_TRUE@am_libX11_xcb_la_OBJECTS = x11_xcb.lo + libX11_xcb_la_OBJECTS = $(am_libX11_xcb_la_OBJECTS) ++libX11_xcb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libX11_xcb_la_LDFLAGS) $(LDFLAGS) -o $@ + @XCB_TRUE@am_libX11_xcb_la_rpath = -rpath $(libdir) +-am__DEPENDENCIES_1 = xlibi18n/libi18n.la +-@XLOCALE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +-am__DEPENDENCIES_3 = xcms/libxcms.la +-@XCMS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) +-am__DEPENDENCIES_5 = xkb/libxkb.la +-@XKB_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5) +-am__DEPENDENCIES_7 = +-libX11_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \ +- $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \ +- $(am__DEPENDENCIES_7) ++am__DEPENDENCIES_1 = ++libX11_la_DEPENDENCIES = $(USE_I18N_LIBS) $(USE_XCMS_LIBS) \ ++ $(USE_XKB_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \ + AutoRep.c Backgnd.c BdrWidth.c Bell.c Border.c ChAccCon.c \ + ChActPGb.c ChClMode.c ChCmap.c ChGC.c ChKeyCon.c ChkIfEv.c \ +@@ -201,28 +193,35 @@ am_libX11_la_OBJECTS = AllCells.lo Allow + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) + libX11_la_OBJECTS = $(am_libX11_la_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_builddir)/include/X11 ++libX11_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(libX11_la_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)/include/X11@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libX11_xcb_la_SOURCES) $(libX11_la_SOURCES) + DIST_SOURCES = $(am__libX11_xcb_la_SOURCES_DIST) \ + $(am__libX11_la_SOURCES_DIST) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ +- install-exec-recursive install-info-recursive \ +- install-recursive installcheck-recursive installdirs-recursive \ +- pdf-recursive ps-recursive uninstall-info-recursive \ +- uninstall-recursive ++ install-dvi-recursive install-exec-recursive \ ++ install-html-recursive install-info-recursive \ ++ install-pdf-recursive install-ps-recursive install-recursive \ ++ installcheck-recursive installdirs-recursive pdf-recursive \ ++ ps-recursive uninstall-recursive + x11dataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(x11data_DATA) ++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ ++ distclean-recursive maintainer-clean-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = util xcms xlibi18n xkb +@@ -230,8 +229,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE + ACLOCAL = @ACLOCAL@ + ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ + ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + APP_MAN_DIR = @APP_MAN_DIR@ + APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ +@@ -268,6 +265,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@ + FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ + GREP = @GREP@ + I18N_MODULE_LIBS = @I18N_MODULE_LIBS@ ++INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +@@ -284,23 +282,16 @@ LIBTOOL = @LIBTOOL@ + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ + LINT = @LINT@ +-LINT_FALSE = @LINT_FALSE@ + LINT_FLAGS = @LINT_FLAGS@ +-LINT_TRUE = @LINT_TRUE@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ +-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ + MAKEINFO = @MAKEINFO@ + MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@ +-MANPAGES_FALSE = @MANPAGES_FALSE@ +-MANPAGES_TRUE = @MANPAGES_TRUE@ + MISC_MAN_DIR = @MISC_MAN_DIR@ + MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ ++MKDIR_P = $(mkdir_p) + OBJEXT = @OBJEXT@ +-OS2_FALSE = @OS2_FALSE@ +-OS2_TRUE = @OS2_TRUE@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ +@@ -315,10 +306,6 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-THRSTUBS_FALSE = @THRSTUBS_FALSE@ +-THRSTUBS_TRUE = @THRSTUBS_TRUE@ +-UDC_FALSE = @UDC_FALSE@ +-UDC_TRUE = @UDC_TRUE@ + VERSION = @VERSION@ + WCHAR32 = @WCHAR32@ + X11_CFLAGS = @X11_CFLAGS@ +@@ -329,26 +316,16 @@ X11_LIBS = @X11_LIBS@ + X11_LOCALEDATADIR = @X11_LOCALEDATADIR@ + X11_LOCALEDIR = @X11_LOCALEDIR@ + X11_LOCALELIBDIR = @X11_LOCALELIBDIR@ +-XCB_FALSE = @XCB_FALSE@ +-XCB_TRUE = @XCB_TRUE@ +-XCMS_FALSE = @XCMS_FALSE@ +-XCMS_TRUE = @XCMS_TRUE@ + XDMCP_CFLAGS = @XDMCP_CFLAGS@ + XDMCP_LIBS = @XDMCP_LIBS@ + XERRORDB = @XERRORDB@ + XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@ + XKBPROTO_LIBS = @XKBPROTO_LIBS@ + XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@ +-XKB_FALSE = @XKB_FALSE@ +-XKB_TRUE = @XKB_TRUE@ + XKEYSYMDB = @XKEYSYMDB@ +-XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@ +-XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@ + XLOCALEDATADIR = @XLOCALEDATADIR@ + XLOCALEDIR = @XLOCALEDIR@ + XLOCALELIBDIR = @XLOCALELIBDIR@ +-XLOCALE_FALSE = @XLOCALE_FALSE@ +-XLOCALE_TRUE = @XLOCALE_TRUE@ + XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@ + XPROTO_CFLAGS = @XPROTO_CFLAGS@ + XPROTO_LIBS = @XPROTO_LIBS@ +@@ -357,13 +334,13 @@ XTHREADS = @XTHREADS@ + XTHREAD_CFLAGS = @XTHREAD_CFLAGS@ + XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@ + XUSE_MTSAFE_API = @XUSE_MTSAFE_API@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_CXX = @ac_ct_CXX@ + ac_ct_F77 = @ac_ct_F77@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ + am__include = @am__include@ + am__leading_dot = @am__leading_dot@ + am__quote = @am__quote@ +@@ -375,6 +352,7 @@ build_alias = @build_alias@ + build_cpu = @build_cpu@ + build_os = @build_os@ + build_vendor = @build_vendor@ ++builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -402,8 +380,11 @@ program_transform_name = @program_transf + psdir = @psdir@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ + @XKB_TRUE@XKB_SUBDIRS = xkb + SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS) + lib_LTLIBRARIES = libX11.la $(am__append_5) +@@ -530,6 +511,8 @@ libX11_la_LIBADD = \ + @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + @LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) + ++@CROSS_COMPILING_FALSE@MAKEKEYS = $(top_builddir)/src/util/makekeys ++@CROSS_COMPILING_TRUE@MAKEKEYS = $(top_builddir)/src/util/xmakekeys + all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -568,7 +551,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $( + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +- $(MAKE) stamp-h1; \ ++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status +@@ -583,7 +566,7 @@ distclean-hdr: + -rm -f config.h stamp-h1 + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ +@@ -594,7 +577,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ +@@ -609,9 +592,9 @@ clean-libLTLIBRARIES: + rm -f "$${dir}/so_locations"; \ + done + libX11-xcb.la: $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_DEPENDENCIES) +- $(LINK) $(am_libX11_xcb_la_rpath) $(libX11_xcb_la_LDFLAGS) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS) ++ $(libX11_xcb_la_LINK) $(am_libX11_xcb_la_rpath) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS) + libX11.la: $(libX11_la_OBJECTS) $(libX11_la_DEPENDENCIES) +- $(LINK) -rpath $(libdir) $(libX11_la_LDFLAGS) $(libX11_la_OBJECTS) $(libX11_la_LIBADD) $(LIBS) ++ $(libX11_la_LINK) -rpath $(libdir) $(libX11_la_OBJECTS) $(libX11_la_LIBADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -885,22 +868,22 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_lock.Plo@am__quote@ + + .c.o: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -910,13 +893,9 @@ mostlyclean-libtool: + + clean-libtool: + -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: + install-x11dataDATA: $(x11data_DATA) + @$(NORMAL_INSTALL) +- test -z "$(x11datadir)" || $(mkdir_p) "$(DESTDIR)$(x11datadir)" ++ test -z "$(x11datadir)" || $(MKDIR_P) "$(DESTDIR)$(x11datadir)" + @list='$(x11data_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +@@ -963,8 +942,7 @@ $(RECURSIVE_TARGETS): + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +-mostlyclean-recursive clean-recursive distclean-recursive \ +-maintainer-clean-recursive: ++$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ +@@ -1065,22 +1043,21 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ + if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +@@ -1094,7 +1071,7 @@ distdir: $(DISTFILES) + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ +- || $(mkdir_p) "$(distdir)/$$subdir" \ ++ || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ +@@ -1102,6 +1079,8 @@ distdir: $(DISTFILES) + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ ++ am__remove_distdir=: \ ++ am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1113,7 +1092,7 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(x11datadir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-recursive +@@ -1151,7 +1130,7 @@ distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile + distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-hdr distclean-libtool distclean-tags ++ distclean-hdr distclean-tags + + dvi: dvi-recursive + +@@ -1165,12 +1144,20 @@ info-am: + + install-data-am: install-x11dataDATA + ++install-dvi: install-dvi-recursive ++ + install-exec-am: install-libLTLIBRARIES + ++install-html: install-html-recursive ++ + install-info: install-info-recursive + + install-man: + ++install-pdf: install-pdf-recursive ++ ++install-ps: install-ps-recursive ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1191,26 +1178,27 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ +- uninstall-x11dataDATA ++uninstall-am: uninstall-libLTLIBRARIES uninstall-x11dataDATA + +-uninstall-info: uninstall-info-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ +- clean clean-generic clean-libLTLIBRARIES clean-libtool \ +- clean-recursive ctags ctags-recursive distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-recursive distclean-tags distdir \ +- dvi dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-exec install-exec-am \ +- install-info install-info-am install-libLTLIBRARIES \ +- install-man install-strip install-x11dataDATA installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ ++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ ++ all all-am check check-am clean clean-generic \ ++ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ ++ distclean distclean-compile distclean-generic distclean-hdr \ ++ distclean-libtool distclean-tags distdir dvi dvi-am html \ ++ html-am info info-am install install-am install-data \ ++ install-data-am install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-libLTLIBRARIES install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ install-x11dataDATA installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am uninstall-info-am \ +- uninstall-libLTLIBRARIES uninstall-x11dataDATA ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am uninstall-libLTLIBRARIES \ ++ uninstall-x11dataDATA + + + preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES)) +@@ -1227,11 +1215,11 @@ preprocess: $(patsubst %.c,%.ii,$(libX11 + @LINT_TRUE@ done + + ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT) +- $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h ++ $(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h + mv ks_tables_h $@ + + $(top_builddir)/src/util/makekeys$(EXEEXT): force +- cd util; $(MAKE) ++ cd util && $(MAKE) + + force: + # Tell versions [3.59,3.63) of GNU make to not export all variables. |