[Planeshift-cvs] CVS: planeshift/src/client/gui Makefile.in,1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv1476/src/client/gui

Modified Files:
	Makefile.in 
Log Message:
makefile updates for updater

Index: Makefile.in
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.in	28 Feb 2003 19:07:15 -0000	1.1
--- Makefile.in	3 Mar 2003 02:30:52 -0000	1.2
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.5 from Makefile.am.

! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.6.3 from Makefile.am.
! # @configure_input@

! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
***************
*** 13,17 ****

  @SET_MAKE@
- 
  SHELL = @SHELL@

--- 14,17 ----
***************
*** 44,50 ****
--- 44,54 ----
  AUTOHEADER = @AUTOHEADER@

+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_HEADER = $(INSTALL_DATA)
***************
*** 58,61 ****
--- 62,69 ----
  host_alias = @host_alias@
  host_triplet = @host@
+ 
+ EXEEXT = @EXEEXT@
+ OBJEXT = @OBJEXT@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
  AMTAR = @AMTAR@
  AS = @AS@
***************
*** 81,85 ****
  DLLTOOL = @DLLTOOL@
  ECHO = @ECHO@
- EXEEXT = @EXEEXT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LIBTOOL = @LIBTOOL@
--- 89,92 ----
***************
*** 88,92 ****
  MYSQLCLIENT_LIBS = @MYSQLCLIENT_LIBS@
  OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
  PTHREAD_CC = @PTHREAD_CC@
--- 95,98 ----
***************
*** 118,122 ****
  pyexecdir = @pyexecdir@
  pythondir = @pythondir@
- 
  SUBDIRS = base

--- 124,127 ----
***************
*** 168,183 ****
  LDFLAGS = @LDFLAGS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
! @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/chatclient.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdcadvant.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdccustomchar.Plo $(DEPDIR)/psdcjob.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdcmain.Plo $(DEPDIR)/psdconn.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdcpath.Plo $(DEPDIR)/psdcredits.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdcskil.Plo $(DEPDIR)/psdcupload.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psddsktop.Plo $(DEPDIR)/psdloading.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdmmenu.Plo $(DEPDIR)/psdmngr.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psdsplsh.Plo $(DEPDIR)/psgwchat.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psgwconfirm.Plo $(DEPDIR)/psgwinv.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psgwskill.Plo $(DEPDIR)/psgwspell.Plo \
! @AMDEP_TRUE@	$(DEPDIR)/psgwwarning.Plo
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--- 173,191 ----
  LDFLAGS = @LDFLAGS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/chatclient.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdcadvant.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdccustomchar.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdcjob.Plo ./$(DEPDIR)/psdcmain.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdconn.Plo ./$(DEPDIR)/psdcpath.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdcredits.Plo ./$(DEPDIR)/psdcskil.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdcupload.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psddsktop.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdloading.Plo ./$(DEPDIR)/psdmmenu.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psdmngr.Plo ./$(DEPDIR)/psdsplsh.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psgwchat.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psgwconfirm.Plo ./$(DEPDIR)/psgwinv.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psgwskill.Plo ./$(DEPDIR)/psgwspell.Plo \
! @AMDEP_TRUE@	./$(DEPDIR)/psgwwarning.Plo
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
***************
*** 209,228 ****
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
- 	-rm -f libtool
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  src/client/gui/Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && \
! 	  CONFIG_HEADERS= CONFIG_LINKS= \
! 	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--- 217,226 ----
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
  $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  src/client/gui/Makefile
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
! 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! libLTLIBRARIES_INSTALL = $(INSTALL)
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
***************
*** 230,235 ****
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
! 	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
! 	    $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
  	  else :; fi; \
  	done
--- 228,234 ----
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  if test -f $$p; then \
! 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
! 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
! 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
  	  else :; fi; \
  	done
***************
*** 238,241 ****
--- 237,241 ----
  	@$(NORMAL_UNINSTALL)
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
  	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
***************
*** 244,247 ****
--- 244,253 ----
  clean-libLTLIBRARIES:
  	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ 	  test -z "$dir" && dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
  psgui.la: $(psgui_la_OBJECTS) $(psgui_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(psgui_la_LDFLAGS) $(psgui_la_OBJECTS) $(psgui_la_LIBADD) $(LIBS)
***************
*** 253,280 ****
  	-rm -f *.tab.c

! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chatclient.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcadvant.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdccustomchar.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcjob.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcmain.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdconn.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcpath.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcredits.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcskil.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdcupload.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psddsktop.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdloading.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdmmenu.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdmngr.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psdsplsh.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwchat.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwconfirm.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwinv.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwskill.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwspell.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/psgwwarning.Plo@am__quote@

  distclean-depend:
! 	-rm -rf $(DEPDIR)

  .cpp.o:
--- 259,286 ----
  	-rm -f *.tab.c

! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatclient.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcadvant.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdccustomchar.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcjob.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcmain.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdconn.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcpath.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcredits.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcskil.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdcupload.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psddsktop.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdloading.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdmmenu.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdmngr.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psdsplsh.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwchat.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwconfirm.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwinv.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwskill.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwspell.Plo@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psgwwarning.Plo@am__quote@

  distclean-depend:
! 	-rm -rf ./$(DEPDIR)

  .cpp.o:
***************
*** 282,286 ****
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<

  .cpp.obj:
--- 288,292 ----
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<

  .cpp.obj:
***************
*** 294,299 ****
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
  CXXDEPMODE = @CXXDEPMODE@
  uninstall-info-am:

--- 300,314 ----
  @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  CXXDEPMODE = @CXXDEPMODE@
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
+ clean-libtool:
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
+ 	-rm -f libtool
  uninstall-info-am:

***************
*** 305,309 ****
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
--- 320,324 ----
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
***************
*** 325,329 ****
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@set fnord $(MAKEFLAGS); amf=$$2; \
  	dot_seen=no; \
  	case "$@" in \
--- 340,344 ----
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
! 	@set fnord $$MAKEFLAGS; amf=$$2; \
  	dot_seen=no; \
  	case "$@" in \
***************
*** 353,360 ****
  	done

  tags: TAGS

  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 368,378 ----
  	done

+ ETAGS = etags
+ ETAGSFLAGS =
+ 
  tags: TAGS

  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 362,366 ****
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique $(LISP)

  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
--- 380,384 ----
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	mkid -fID $$unique

  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
***************
*** 373,377 ****
  	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
--- 391,395 ----
  	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
***************
*** 379,387 ****
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

  GTAGS:
! 	here=`CDPATH=: && cd $(top_builddir) && pwd` \
  	  && cd $(top_srcdir) \
  	  && gtags -i $(GTAGS_ARGS) $$here
--- 397,406 ----
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
! 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	     $$tags $$unique

  GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
  	  && cd $(top_srcdir) \
  	  && gtags -i $(GTAGS_ARGS) $$here
***************
*** 389,393 ****
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
- 
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

--- 408,411 ----
***************
*** 396,408 ****

  distdir: $(DISTFILES)
! 	@for file in $(DISTFILES); do \
! 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    $(mkinstalldirs) "$(distdir)/$$dir"; \
  	  fi; \
  	  if test -d $$d/$$file; then \
! 	    cp -pR $$d/$$file $(distdir) \
! 	    || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
--- 414,431 ----

  distdir: $(DISTFILES)
! 	@list='$(DISTFILES)'; for file in $$list; 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"; \
! 	    $(mkinstalldirs) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
  	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
***************
*** 411,415 ****
  	  fi; \
  	done
! 	for subdir in $(SUBDIRS); do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
--- 434,438 ----
  	  fi; \
  	done
! 	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d $(distdir)/$$subdir \
***************
*** 442,445 ****
--- 465,469 ----
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  INSTALL_STRIP_FLAG=-s \
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 449,453 ****

  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

  maintainer-clean-generic:
--- 473,477 ----

  distclean-generic:
! 	-rm -f Makefile $(CONFIG_CLEAN_FILES)

  maintainer-clean-generic: