1.1 --- a/src/libident/Makefile.in	Fri May 07 16:42:58 2010 +0200
     1.2 +++ b/src/libident/Makefile.in	Fri May 07 16:44:26 2010 +0200
     1.3 @@ -1,8 +1,9 @@
     1.4 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
     1.5 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
     1.6  # @configure_input@
     1.7  
     1.8 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
     1.9 -# Free Software Foundation, Inc.
    1.10 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    1.11 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
    1.12 +# Inc.
    1.13  # This Makefile.in is free software; the Free Software Foundation
    1.14  # gives unlimited permission to copy and/or distribute it,
    1.15  # with or without modifications, as long as this notice is preserved.
    1.16 @@ -14,16 +15,12 @@
    1.17  
    1.18  @SET_MAKE@
    1.19  
    1.20 -srcdir = @srcdir@
    1.21 -top_srcdir = @top_srcdir@
    1.22  VPATH = @srcdir@
    1.23  pkgdatadir = $(datadir)/@PACKAGE@
    1.24 +pkgincludedir = $(includedir)/@PACKAGE@
    1.25  pkglibdir = $(libdir)/@PACKAGE@
    1.26 -pkgincludedir = $(includedir)/@PACKAGE@
    1.27 -top_builddir = ../..
    1.28 -
    1.29 +pkglibexecdir = $(libexecdir)/@PACKAGE@
    1.30  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    1.31 -INSTALL = @INSTALL@
    1.32  install_sh_DATA = $(install_sh) -c -m 644
    1.33  install_sh_PROGRAM = $(install_sh) -c
    1.34  install_sh_SCRIPT = $(install_sh) -c
    1.35 @@ -35,9 +32,40 @@
    1.36  NORMAL_UNINSTALL = :
    1.37  PRE_UNINSTALL = :
    1.38  POST_UNINSTALL = :
    1.39 +subdir = src/libident
    1.40 +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    1.41 +	INSTALL
    1.42 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.43 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    1.44 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    1.45 +	$(ACLOCAL_M4)
    1.46 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    1.47 +CONFIG_HEADER = $(top_builddir)/config.h
    1.48 +CONFIG_CLEAN_FILES =
    1.49 +CONFIG_CLEAN_VPATH_FILES =
    1.50 +LIBRARIES = $(noinst_LIBRARIES)
    1.51 +AR = ar
    1.52 +ARFLAGS = cru
    1.53 +libident_a_AR = $(AR) $(ARFLAGS)
    1.54 +libident_a_LIBADD =
    1.55 +am_libident_a_OBJECTS = ident.$(OBJEXT) id_open.$(OBJEXT) \
    1.56 +	id_close.$(OBJEXT) id_query.$(OBJEXT) id_parse.$(OBJEXT) \
    1.57 +	support.$(OBJEXT) version.$(OBJEXT)
    1.58 +libident_a_OBJECTS = $(am_libident_a_OBJECTS)
    1.59 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
    1.60 +depcomp = $(SHELL) $(top_srcdir)/depcomp
    1.61 +am__depfiles_maybe = depfiles
    1.62 +am__mv = mv -f
    1.63 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    1.64 +	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    1.65 +CCLD = $(CC)
    1.66 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    1.67 +SOURCES = $(libident_a_SOURCES)
    1.68 +DIST_SOURCES = $(libident_a_SOURCES)
    1.69 +ETAGS = etags
    1.70 +CTAGS = ctags
    1.71 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    1.72  ACLOCAL = @ACLOCAL@
    1.73 -AMDEP_FALSE = @AMDEP_FALSE@
    1.74 -AMDEP_TRUE = @AMDEP_TRUE@
    1.75  AMTAR = @AMTAR@
    1.76  AUTOCONF = @AUTOCONF@
    1.77  AUTOHEADER = @AUTOHEADER@
    1.78 @@ -61,6 +89,7 @@
    1.79  GLIB_LIBS = @GLIB_LIBS@
    1.80  GREP = @GREP@
    1.81  IDENT_LIBS = @IDENT_LIBS@
    1.82 +INSTALL = @INSTALL@
    1.83  INSTALL_DATA = @INSTALL_DATA@
    1.84  INSTALL_PROGRAM = @INSTALL_PROGRAM@
    1.85  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    1.86 @@ -72,12 +101,14 @@
    1.87  LTLIBOBJS = @LTLIBOBJS@
    1.88  MAKEINFO = @MAKEINFO@
    1.89  MD5_LIBS = @MD5_LIBS@
    1.90 +MKDIR_P = @MKDIR_P@
    1.91  OBJEXT = @OBJEXT@
    1.92  PACKAGE = @PACKAGE@
    1.93  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    1.94  PACKAGE_NAME = @PACKAGE_NAME@
    1.95  PACKAGE_STRING = @PACKAGE_STRING@
    1.96  PACKAGE_TARNAME = @PACKAGE_TARNAME@
    1.97 +PACKAGE_URL = @PACKAGE_URL@
    1.98  PACKAGE_VERSION = @PACKAGE_VERSION@
    1.99  PATH_SEPARATOR = @PATH_SEPARATOR@
   1.100  PKG_CONFIG = @PKG_CONFIG@
   1.101 @@ -88,14 +119,19 @@
   1.102  STRIP = @STRIP@
   1.103  USE_LIBLOCKFILE = @USE_LIBLOCKFILE@
   1.104  VERSION = @VERSION@
   1.105 +abs_builddir = @abs_builddir@
   1.106 +abs_srcdir = @abs_srcdir@
   1.107 +abs_top_builddir = @abs_top_builddir@
   1.108 +abs_top_srcdir = @abs_top_srcdir@
   1.109  ac_ct_CC = @ac_ct_CC@
   1.110 -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
   1.111 -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
   1.112  am__include = @am__include@
   1.113  am__leading_dot = @am__leading_dot@
   1.114  am__quote = @am__quote@
   1.115 +am__tar = @am__tar@
   1.116 +am__untar = @am__untar@
   1.117  bindir = @bindir@
   1.118  build_alias = @build_alias@
   1.119 +builddir = @builddir@
   1.120  datadir = @datadir@
   1.121  datarootdir = @datarootdir@
   1.122  docdir = @docdir@
   1.123 @@ -112,6 +148,7 @@
   1.124  localedir = @localedir@
   1.125  localstatedir = @localstatedir@
   1.126  mandir = @mandir@
   1.127 +mkdir_p = @mkdir_p@
   1.128  oldincludedir = @oldincludedir@
   1.129  pdfdir = @pdfdir@
   1.130  prefix = @prefix@
   1.131 @@ -119,19 +156,20 @@
   1.132  psdir = @psdir@
   1.133  sbindir = @sbindir@
   1.134  sharedstatedir = @sharedstatedir@
   1.135 +srcdir = @srcdir@
   1.136  sysconfdir = @sysconfdir@
   1.137  target_alias = @target_alias@
   1.138 +top_build_prefix = @top_build_prefix@
   1.139 +top_builddir = @top_builddir@
   1.140 +top_srcdir = @top_srcdir@
   1.141  with_confdir = @with_confdir@
   1.142  with_group = @with_group@
   1.143  with_logdir = @with_logdir@
   1.144  with_spooldir = @with_spooldir@
   1.145  with_user = @with_user@
   1.146  EXTRA_DIST = README_MASQMAIL
   1.147 -
   1.148  AM_CFLAGS = @CFLAGS@ -D_GNU_SOURCE -DHAVE_ANSIHEADERS
   1.149 -
   1.150  noinst_LIBRARIES = libident.a
   1.151 -
   1.152  libident_a_SOURCES = \
   1.153  	ident.h\
   1.154  	ident.c\
   1.155 @@ -142,46 +180,40 @@
   1.156  	support.c\
   1.157  	version.c
   1.158  
   1.159 -subdir = src/libident
   1.160 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   1.161 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
   1.162 -CONFIG_HEADER = $(top_builddir)/config.h
   1.163 -CONFIG_CLEAN_FILES =
   1.164 -LIBRARIES = $(noinst_LIBRARIES)
   1.165 -
   1.166 -libident_a_AR = $(AR) cru
   1.167 -libident_a_LIBADD =
   1.168 -am_libident_a_OBJECTS = ident.$(OBJEXT) id_open.$(OBJEXT) \
   1.169 -	id_close.$(OBJEXT) id_query.$(OBJEXT) id_parse.$(OBJEXT) \
   1.170 -	support.$(OBJEXT) version.$(OBJEXT)
   1.171 -libident_a_OBJECTS = $(am_libident_a_OBJECTS)
   1.172 -
   1.173 -DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
   1.174 -depcomp = $(SHELL) $(top_srcdir)/depcomp
   1.175 -am__depfiles_maybe = depfiles
   1.176 -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/id_close.Po ./$(DEPDIR)/id_open.Po \
   1.177 -@AMDEP_TRUE@	./$(DEPDIR)/id_parse.Po ./$(DEPDIR)/id_query.Po \
   1.178 -@AMDEP_TRUE@	./$(DEPDIR)/ident.Po ./$(DEPDIR)/support.Po \
   1.179 -@AMDEP_TRUE@	./$(DEPDIR)/version.Po
   1.180 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
   1.181 -	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   1.182 -CCLD = $(CC)
   1.183 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
   1.184 -DIST_SOURCES = $(libident_a_SOURCES)
   1.185 -DIST_COMMON = README $(srcdir)/Makefile.in INSTALL Makefile.am
   1.186 -SOURCES = $(libident_a_SOURCES)
   1.187 -
   1.188  all: all-am
   1.189  
   1.190  .SUFFIXES:
   1.191  .SUFFIXES: .c .o .obj
   1.192 -$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
   1.193 -	cd $(top_srcdir) && \
   1.194 -	  $(AUTOMAKE) --gnu  src/libident/Makefile
   1.195 -Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
   1.196 -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
   1.197 +$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
   1.198 +	@for dep in $?; do \
   1.199 +	  case '$(am__configure_deps)' in \
   1.200 +	    *$$dep*) \
   1.201 +	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
   1.202 +	        && { if test -f $@; then exit 0; else break; fi; }; \
   1.203 +	      exit 1;; \
   1.204 +	  esac; \
   1.205 +	done; \
   1.206 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libident/Makefile'; \
   1.207 +	$(am__cd) $(top_srcdir) && \
   1.208 +	  $(AUTOMAKE) --gnu src/libident/Makefile
   1.209 +.PRECIOUS: Makefile
   1.210 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   1.211 +	@case '$?' in \
   1.212 +	  *config.status*) \
   1.213 +	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
   1.214 +	  *) \
   1.215 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
   1.216 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
   1.217 +	esac;
   1.218  
   1.219 -AR = ar
   1.220 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   1.221 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.222 +
   1.223 +$(top_srcdir)/configure:  $(am__configure_deps)
   1.224 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.225 +$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   1.226 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
   1.227 +$(am__aclocal_m4_deps):
   1.228  
   1.229  clean-noinstLIBRARIES:
   1.230  	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
   1.231 @@ -191,7 +223,7 @@
   1.232  	$(RANLIB) libident.a
   1.233  
   1.234  mostlyclean-compile:
   1.235 -	-rm -f *.$(OBJEXT) core *.core
   1.236 +	-rm -f *.$(OBJEXT)
   1.237  
   1.238  distclean-compile:
   1.239  	-rm -f *.tab.c
   1.240 @@ -205,117 +237,104 @@
   1.241  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
   1.242  
   1.243  .c.o:
   1.244 -@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
   1.245 -@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
   1.246 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
   1.247 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
   1.248 -@am__fastdepCC_TRUE@	fi
   1.249 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.250 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.251  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.252 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
   1.253 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.254 -@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
   1.255 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.256 +@am__fastdepCC_FALSE@	$(COMPILE) -c $<
   1.257  
   1.258  .c.obj:
   1.259 -@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
   1.260 -@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
   1.261 -@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
   1.262 -@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
   1.263 -@am__fastdepCC_TRUE@	fi
   1.264 +@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
   1.265 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.266  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.267 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
   1.268 -@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.269 -@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
   1.270 -uninstall-info-am:
   1.271 -
   1.272 -ETAGS = etags
   1.273 -ETAGSFLAGS =
   1.274 -
   1.275 -CTAGS = ctags
   1.276 -CTAGSFLAGS =
   1.277 -
   1.278 -tags: TAGS
   1.279 +@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.280 +@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
   1.281  
   1.282  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   1.283  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
   1.284  	unique=`for i in $$list; do \
   1.285  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.286  	  done | \
   1.287 -	  $(AWK) '    { files[$$0] = 1; } \
   1.288 -	       END { for (i in files) print i; }'`; \
   1.289 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.290 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.291  	mkid -fID $$unique
   1.292 +tags: TAGS
   1.293  
   1.294  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.295  		$(TAGS_FILES) $(LISP)
   1.296 -	tags=; \
   1.297 +	set x; \
   1.298  	here=`pwd`; \
   1.299  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.300  	unique=`for i in $$list; do \
   1.301  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.302  	  done | \
   1.303 -	  $(AWK) '    { files[$$0] = 1; } \
   1.304 -	       END { for (i in files) print i; }'`; \
   1.305 -	test -z "$(ETAGS_ARGS)$$tags$$unique" \
   1.306 -	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.307 -	     $$tags $$unique
   1.308 -
   1.309 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.310 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.311 +	shift; \
   1.312 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
   1.313 +	  test -n "$$unique" || unique=$$empty_fix; \
   1.314 +	  if test $$# -gt 0; then \
   1.315 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.316 +	      "$$@" $$unique; \
   1.317 +	  else \
   1.318 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.319 +	      $$unique; \
   1.320 +	  fi; \
   1.321 +	fi
   1.322  ctags: CTAGS
   1.323  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.324  		$(TAGS_FILES) $(LISP)
   1.325 -	tags=; \
   1.326 -	here=`pwd`; \
   1.327  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.328  	unique=`for i in $$list; do \
   1.329  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.330  	  done | \
   1.331 -	  $(AWK) '    { files[$$0] = 1; } \
   1.332 -	       END { for (i in files) print i; }'`; \
   1.333 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
   1.334 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.335 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.336 +	test -z "$(CTAGS_ARGS)$$unique" \
   1.337  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
   1.338 -	     $$tags $$unique
   1.339 +	     $$unique
   1.340  
   1.341  GTAGS:
   1.342  	here=`$(am__cd) $(top_builddir) && pwd` \
   1.343 -	  && cd $(top_srcdir) \
   1.344 -	  && gtags -i $(GTAGS_ARGS) $$here
   1.345 +	  && $(am__cd) $(top_srcdir) \
   1.346 +	  && gtags -i $(GTAGS_ARGS) "$$here"
   1.347  
   1.348  distclean-tags:
   1.349  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   1.350 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   1.351 -
   1.352 -top_distdir = ../..
   1.353 -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
   1.354  
   1.355  distdir: $(DISTFILES)
   1.356 -	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
   1.357 -	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
   1.358 -	list='$(DISTFILES)'; for file in $$list; do \
   1.359 -	  case $$file in \
   1.360 -	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
   1.361 -	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
   1.362 -	  esac; \
   1.363 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.364 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.365 +	list='$(DISTFILES)'; \
   1.366 +	  dist_files=`for file in $$list; do echo $$file; done | \
   1.367 +	  sed -e "s|^$$srcdirstrip/||;t" \
   1.368 +	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
   1.369 +	case $$dist_files in \
   1.370 +	  */*) $(MKDIR_P) `echo "$$dist_files" | \
   1.371 +			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
   1.372 +			   sort -u` ;; \
   1.373 +	esac; \
   1.374 +	for file in $$dist_files; do \
   1.375  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   1.376 -	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.377 -	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
   1.378 -	    dir="/$$dir"; \
   1.379 -	    $(mkinstalldirs) "$(distdir)$$dir"; \
   1.380 +	  if test -d $$d/$$file; then \
   1.381 +	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.382 +	    if test -d "$(distdir)/$$file"; then \
   1.383 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.384 +	    fi; \
   1.385 +	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   1.386 +	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   1.387 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.388 +	    fi; \
   1.389 +	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   1.390  	  else \
   1.391 -	    dir=''; \
   1.392 -	  fi; \
   1.393 -	  if test -d $$d/$$file; then \
   1.394 -	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   1.395 -	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
   1.396 -	    fi; \
   1.397 -	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
   1.398 -	  else \
   1.399 -	    test -f $(distdir)/$$file \
   1.400 -	    || cp -p $$d/$$file $(distdir)/$$file \
   1.401 +	    test -f "$(distdir)/$$file" \
   1.402 +	    || cp -p $$d/$$file "$(distdir)/$$file" \
   1.403  	    || exit 1; \
   1.404  	  fi; \
   1.405  	done
   1.406  check-am: all-am
   1.407  check: check-am
   1.408  all-am: Makefile $(LIBRARIES)
   1.409 -
   1.410  installdirs:
   1.411  install: install-am
   1.412  install-exec: install-exec-am
   1.413 @@ -336,7 +355,8 @@
   1.414  clean-generic:
   1.415  
   1.416  distclean-generic:
   1.417 -	-rm -f $(CONFIG_CLEAN_FILES)
   1.418 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   1.419 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   1.420  
   1.421  maintainer-clean-generic:
   1.422  	@echo "This command is intended for maintainers to use"
   1.423 @@ -355,18 +375,40 @@
   1.424  
   1.425  dvi-am:
   1.426  
   1.427 +html: html-am
   1.428 +
   1.429 +html-am:
   1.430 +
   1.431  info: info-am
   1.432  
   1.433  info-am:
   1.434  
   1.435  install-data-am:
   1.436  
   1.437 +install-dvi: install-dvi-am
   1.438 +
   1.439 +install-dvi-am:
   1.440 +
   1.441  install-exec-am:
   1.442  
   1.443 +install-html: install-html-am
   1.444 +
   1.445 +install-html-am:
   1.446 +
   1.447  install-info: install-info-am
   1.448  
   1.449 +install-info-am:
   1.450 +
   1.451  install-man:
   1.452  
   1.453 +install-pdf: install-pdf-am
   1.454 +
   1.455 +install-pdf-am:
   1.456 +
   1.457 +install-ps: install-ps-am
   1.458 +
   1.459 +install-ps-am:
   1.460 +
   1.461  installcheck-am:
   1.462  
   1.463  maintainer-clean: maintainer-clean-am
   1.464 @@ -386,17 +428,23 @@
   1.465  
   1.466  ps-am:
   1.467  
   1.468 -uninstall-am: uninstall-info-am
   1.469 +uninstall-am:
   1.470 +
   1.471 +.MAKE: install-am install-strip
   1.472  
   1.473  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
   1.474  	clean-noinstLIBRARIES ctags distclean distclean-compile \
   1.475 -	distclean-generic distclean-tags distdir dvi dvi-am info \
   1.476 -	info-am install install-am install-data install-data-am \
   1.477 -	install-exec install-exec-am install-info install-info-am \
   1.478 -	install-man install-strip installcheck installcheck-am \
   1.479 -	installdirs maintainer-clean maintainer-clean-generic \
   1.480 -	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
   1.481 -	ps ps-am tags uninstall uninstall-am uninstall-info-am
   1.482 +	distclean-generic distclean-tags distdir dvi dvi-am html \
   1.483 +	html-am info info-am install install-am install-data \
   1.484 +	install-data-am install-dvi install-dvi-am install-exec \
   1.485 +	install-exec-am install-html install-html-am install-info \
   1.486 +	install-info-am install-man install-pdf install-pdf-am \
   1.487 +	install-ps install-ps-am install-strip installcheck \
   1.488 +	installcheck-am installdirs maintainer-clean \
   1.489 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
   1.490 +	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
   1.491 +	uninstall-am
   1.492 +
   1.493  
   1.494  # Tell versions [3.59,3.63) of GNU make to not export all variables.
   1.495  # Otherwise a system limit (for SysV at least) may be exceeded.