[Pkg-shadow-commits] sid/debian/patches 008_src.dpatch.new,1.3,1.4 007_lib.dpatch,1.4,NONE

Christian Perrier pkg-shadow-devel@lists.alioth.debian.org
Wed, 04 May 2005 14:39:20 +0000


Update of /cvsroot/pkg-shadow/sid/debian/patches
In directory haydn:/tmp/cvs-serv2062

Modified Files:
	008_src.dpatch.new 
Removed Files:
	007_lib.dpatch 
Log Message:
Remove patching Makefile.in files. THis completely removes the 007 patch


Index: 008_src.dpatch.new
===================================================================
RCS file: /cvsroot/pkg-shadow/sid/debian/patches/008_src.dpatch.new,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 008_src.dpatch.new	22 Mar 2005 22:04:18 -0000	1.3
+++ 008_src.dpatch.new	4 May 2005 14:39:18 -0000	1.4
@@ -748,816 +748,6 @@
  	ln -sf vigr	$(DESTDIR)$(bindir)/vipw
  	for i in $(suidbins); do \
  		chmod 4755 $(DESTDIR)$(bindir)/$$i; \
-diff -Nru shadow-4.0.3/src/Makefile.in shadow-4.0.3_30.4/src/Makefile.in
---- shadow-4.0.3/src/Makefile.in	2002-03-13 20:04:10.000000000 +0100
-+++ shadow-4.0.3_30.4/src/Makefile.in	2004-11-26 07:27:34.000000000 +0100
-@@ -1,6 +1,7 @@
--# Makefile.in generated automatically by automake 1.5 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- # Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -13,107 +14,163 @@
- 
- @SET_MAKE@
- 
--SHELL = @SHELL@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
- 
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
--
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
--transform = @program_transform_name@
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
- host_triplet = @host@
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
--AS = @AS@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
--CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
- CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
-+
-+DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\"
- DEPDIR = @DEPDIR@
--DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
- EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
- GENCAT = @GENCAT@
- GLIBC21 = @GLIBC21@
--GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
-+HAVE_ASPRINTF = @HAVE_ASPRINTF@
-+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
-+HAVE_SNPRINTF = @HAVE_SNPRINTF@
-+HAVE_WPRINTF = @HAVE_WPRINTF@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLBISON = @INTLBISON@
- INTLLIBS = @INTLLIBS@
- INTLOBJS = @INTLOBJS@
- INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-+LDFLAGS = @LDFLAGS@
- LIBCRACK = @LIBCRACK@
- LIBCRYPT = @LIBCRYPT@
- LIBICONV = @LIBICONV@
-+LIBINTL = @LIBINTL@
- LIBMD = @LIBMD@
-+LIBOBJS = @LIBOBJS@
- LIBPAM = @LIBPAM@
-+LIBS = @LIBS@
- LIBSKEY = @LIBSKEY@
- LIBTCFS = @LIBTCFS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
-+LTLIBICONV = @LTLIBICONV@
-+LTLIBINTL = @LTLIBINTL@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
--OBJDUMP = @OBJDUMP@
-+MSGMERGE = @MSGMERGE@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
--POFILES = @POFILES@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- POSUB = @POSUB@
- RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- STRIP = @STRIP@
- U = @U@
- USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-+XGETTEXT = @XGETTEXT@
- YACC = @YACC@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+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@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
- install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
- 
- EXTRA_DOST = .indent.pro
- 
- ubindir = ${prefix}/bin
- usbindir = ${prefix}/sbin
- 
--DEFS = -D_HAVE_CONFIG_H -DLOCALEDIR=\"$(datadir)/locale\"
--
- INCLUDES = -I${top_srcdir} \
- 	-I${top_srcdir}/lib \
- 	-I$(top_srcdir)/libmisc
-@@ -134,7 +191,7 @@
- ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
- usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \
- 	logoutd mkpasswd newusers useradd userdel usermod grpck \
--	pwck vipw grpconv grpunconv pwconv pwunconv
-+	pwck vipw grpconv grpunconv pwconv pwunconv cppw
- 
- 
- noinst_PROGRAMS = id sulogin
-@@ -164,6 +221,7 @@
- userdel_LDADD = $(LDADD) $(LIBPAM)
- usermod_LDADD = $(LDADD) $(LIBPAM)
- subdir = src
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -177,7 +235,7 @@
- 	mkpasswd$(EXEEXT) newusers$(EXEEXT) useradd$(EXEEXT) \
- 	userdel$(EXEEXT) usermod$(EXEEXT) grpck$(EXEEXT) pwck$(EXEEXT) \
- 	vipw$(EXEEXT) grpconv$(EXEEXT) grpunconv$(EXEEXT) \
--	pwconv$(EXEEXT) pwunconv$(EXEEXT)
-+	pwconv$(EXEEXT) pwunconv$(EXEEXT) cppw$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(ubin_PROGRAMS) \
- 	$(usbin_PROGRAMS)
- 
-@@ -201,6 +259,12 @@
- chsh_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
- 	$(top_builddir)/lib/libshadow.la
- chsh_LDFLAGS =
-+cppw_SOURCES = cppw.c
-+cppw_OBJECTS = cppw.$(OBJEXT)
-+cppw_LDADD = $(LDADD)
-+cppw_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
-+	$(top_builddir)/lib/libshadow.la
-+cppw_LDFLAGS =
- dpasswd_SOURCES = dpasswd.c
- dpasswd_OBJECTS = dpasswd.$(OBJEXT)
- dpasswd_LDADD = $(LDADD)
-@@ -359,28 +423,27 @@
- vipw_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
- 	$(top_builddir)/lib/libshadow.la
- vipw_LDFLAGS =
-+
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
--CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
--@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/chage.Po $(DEPDIR)/chfn.Po \
--@AMDEP_TRUE@	$(DEPDIR)/chpasswd.Po $(DEPDIR)/chsh.Po \
--@AMDEP_TRUE@	$(DEPDIR)/dpasswd.Po $(DEPDIR)/expiry.Po \
--@AMDEP_TRUE@	$(DEPDIR)/faillog.Po $(DEPDIR)/gpasswd.Po \
--@AMDEP_TRUE@	$(DEPDIR)/groupadd.Po $(DEPDIR)/groupdel.Po \
--@AMDEP_TRUE@	$(DEPDIR)/groupmod.Po $(DEPDIR)/groups.Po \
--@AMDEP_TRUE@	$(DEPDIR)/grpck.Po $(DEPDIR)/grpconv.Po \
--@AMDEP_TRUE@	$(DEPDIR)/grpunconv.Po $(DEPDIR)/id.Po \
--@AMDEP_TRUE@	$(DEPDIR)/lastlog.Po $(DEPDIR)/login.Po \
--@AMDEP_TRUE@	$(DEPDIR)/logoutd.Po $(DEPDIR)/mkpasswd.Po \
--@AMDEP_TRUE@	$(DEPDIR)/newgrp.Po $(DEPDIR)/newusers.Po \
--@AMDEP_TRUE@	$(DEPDIR)/passwd.Po $(DEPDIR)/pwck.Po \
--@AMDEP_TRUE@	$(DEPDIR)/pwconv.Po $(DEPDIR)/pwunconv.Po \
--@AMDEP_TRUE@	$(DEPDIR)/su.Po $(DEPDIR)/suauth.Po \
--@AMDEP_TRUE@	$(DEPDIR)/sulogin.Po $(DEPDIR)/useradd.Po \
--@AMDEP_TRUE@	$(DEPDIR)/userdel.Po $(DEPDIR)/usermod.Po \
--@AMDEP_TRUE@	$(DEPDIR)/vipw.Po
-+am__depfiles_maybe = depfiles
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/chage.Po ./$(DEPDIR)/chfn.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/chpasswd.Po ./$(DEPDIR)/chsh.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cppw.Po ./$(DEPDIR)/dpasswd.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/expiry.Po ./$(DEPDIR)/faillog.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/gpasswd.Po ./$(DEPDIR)/groupadd.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/groupdel.Po ./$(DEPDIR)/groupmod.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/groups.Po ./$(DEPDIR)/grpck.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/grpconv.Po ./$(DEPDIR)/grpunconv.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/id.Po ./$(DEPDIR)/lastlog.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/login.Po ./$(DEPDIR)/logoutd.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/mkpasswd.Po ./$(DEPDIR)/newgrp.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/newusers.Po ./$(DEPDIR)/passwd.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/pwck.Po ./$(DEPDIR)/pwconv.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/pwunconv.Po ./$(DEPDIR)/su.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/suauth.Po ./$(DEPDIR)/sulogin.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/useradd.Po ./$(DEPDIR)/userdel.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/usermod.Po ./$(DEPDIR)/vipw.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -388,36 +451,25 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
--DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c dpasswd.c expiry.c \
--	faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \
--	grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c \
--	mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c \
--	pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c \
-+DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c cppw.c dpasswd.c \
-+	expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c \
-+	groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c \
-+	logoutd.c mkpasswd.c newgrp.c newusers.c passwd.c pwck.c \
-+	pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c \
- 	usermod.c vipw.c
--DIST_COMMON = Makefile.am Makefile.in
--SOURCES = chage.c chfn.c chpasswd.c chsh.c dpasswd.c expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c
-+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-+SOURCES = chage.c chfn.c chpasswd.c chsh.c cppw.c dpasswd.c expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c mkpasswd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c
- 
- all: all-am
- 
- .SUFFIXES:
- .SUFFIXES: .c .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.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --gnu  src/Makefile
- Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && \
--	  CONFIG_HEADERS= CONFIG_LINKS= \
--	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -426,25 +478,34 @@
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- 	  rm -f $(DESTDIR)$(bindir)/$$f; \
- 	done
- 
- clean-binPROGRAMS:
--	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- 
- clean-noinstPROGRAMS:
--	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+ubinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-ubinPROGRAMS: $(ubin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(ubindir)
-@@ -453,22 +514,27 @@
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(ubindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(ubindir)/$$f; \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ubinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ubindir)/$$f"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(ubinPROGRAMS_INSTALL) $$p $(DESTDIR)$(ubindir)/$$f || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-ubinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(ubin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  echo " rm -f $(DESTDIR)$(ubindir)/$$f"; \
- 	  rm -f $(DESTDIR)$(ubindir)/$$f; \
- 	done
- 
- clean-ubinPROGRAMS:
--	-test -z "$(ubin_PROGRAMS)" || rm -f $(ubin_PROGRAMS)
-+	@list='$(ubin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
-+usbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- install-usbinPROGRAMS: $(usbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(usbindir)
-@@ -477,22 +543,26 @@
- 	  if test -f $$p \
- 	     || test -f $$p1 \
- 	  ; then \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(usbindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(usbindir)/$$f; \
-+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(usbindir)/$$f"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(usbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(usbindir)/$$f || exit 1; \
- 	  else :; fi; \
- 	done
- 
- uninstall-usbinPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(usbin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- 	  echo " rm -f $(DESTDIR)$(usbindir)/$$f"; \
- 	  rm -f $(DESTDIR)$(usbindir)/$$f; \
- 	done
- 
- clean-usbinPROGRAMS:
--	-test -z "$(usbin_PROGRAMS)" || rm -f $(usbin_PROGRAMS)
-+	@list='$(usbin_PROGRAMS)'; for p in $$list; do \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	  echo " rm -f $$p $$f"; \
-+	  rm -f $$p $$f ; \
-+	done
- chage$(EXEEXT): $(chage_OBJECTS) $(chage_DEPENDENCIES) 
- 	@rm -f chage$(EXEEXT)
- 	$(LINK) $(chage_LDFLAGS) $(chage_OBJECTS) $(chage_LDADD) $(LIBS)
-@@ -505,6 +575,9 @@
- chsh$(EXEEXT): $(chsh_OBJECTS) $(chsh_DEPENDENCIES) 
- 	@rm -f chsh$(EXEEXT)
- 	$(LINK) $(chsh_LDFLAGS) $(chsh_OBJECTS) $(chsh_LDADD) $(LIBS)
-+cppw$(EXEEXT): $(cppw_OBJECTS) $(cppw_DEPENDENCIES) 
-+	@rm -f cppw$(EXEEXT)
-+	$(LINK) $(cppw_LDFLAGS) $(cppw_OBJECTS) $(cppw_LDADD) $(LIBS)
- dpasswd$(EXEEXT): $(dpasswd_OBJECTS) $(dpasswd_DEPENDENCIES) 
- 	@rm -f dpasswd$(EXEEXT)
- 	$(LINK) $(dpasswd_LDFLAGS) $(dpasswd_OBJECTS) $(dpasswd_LDADD) $(LIBS)
-@@ -596,110 +669,163 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chage.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chfn.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chpasswd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chsh.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dpasswd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/expiry.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/faillog.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gpasswd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupadd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupdel.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groupmod.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/groups.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpck.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpconv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/grpunconv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/id.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lastlog.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/login.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logoutd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkpasswd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/newgrp.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/newusers.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/passwd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwck.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwconv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pwunconv.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/su.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/suauth.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sulogin.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/useradd.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/userdel.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usermod.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vipw.Po@am__quote@
--
--distclean-depend:
--	-rm -rf $(DEPDIR)
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chage.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chfn.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpasswd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cppw.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpasswd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expiry.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faillog.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpasswd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupadd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupdel.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupmod.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groups.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpck.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpconv.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpunconv.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastlog.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logoutd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkpasswd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newgrp.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newusers.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passwd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwck.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwconv.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwunconv.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suauth.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sulogin.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/useradd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/userdel.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usermod.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vipw.Po@am__quote@
- 
- .c.o:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCC_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .c.obj:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(COMPILE) -c `cygpath -w $<`
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCC_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
- 
- .c.lo:
--@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
--CCDEPMODE = @CCDEPMODE@
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCC_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
- uninstall-info-am:
- 
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
- tags: TAGS
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--	list='$(SOURCES) $(HEADERS) $(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; \
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	mkid -fID $$unique $(LISP)
-+	mkid -fID $$unique
- 
- TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS) $(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; \
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
- 
- GTAGS:
--	here=`CDPATH=: && cd $(top_builddir) && pwd` \
-+	here=`$(am__cd) $(top_builddir) && pwd` \
- 	  && cd $(top_srcdir) \
- 	  && gtags -i $(GTAGS_ARGS) $$here
- 
- distclean-tags:
--	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
--
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- 
- top_distdir = ..
- distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
--	@for file in $(DISTFILES); do \
--	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-+	@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; \
-+	  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 \
--	    $(mkinstalldirs) "$(distdir)/$$dir"; \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
- 	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pR $$d/$$file $(distdir) \
--	    || exit 1; \
-+	    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 \
- 	    || cp -p $$d/$$file $(distdir)/$$file \
-@@ -712,7 +838,6 @@
- 
- installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(ubindir) $(DESTDIR)$(usbindir)
--
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -724,6 +849,7 @@
- installcheck: installcheck-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- 	  `test -z '$(STRIP)' || \
- 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-@@ -731,7 +857,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -743,9 +869,10 @@
- 	mostlyclean-am
- 
- distclean: distclean-am
--
--distclean-am: clean-am distclean-compile distclean-depend \
--	distclean-generic distclean-libtool distclean-tags
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -770,7 +897,8 @@
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
--
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
- maintainer-clean-am: distclean-am maintainer-clean-generic
- 
- mostlyclean: mostlyclean-am
-@@ -778,27 +906,34 @@
- mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- 	mostlyclean-libtool
- 
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
- 	uninstall-ubinPROGRAMS uninstall-usbinPROGRAMS
- 
--.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- 	clean-generic clean-libtool clean-noinstPROGRAMS \
--	clean-ubinPROGRAMS clean-usbinPROGRAMS distclean \
--	distclean-compile distclean-depend distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am info \
--	info-am install install-am install-binPROGRAMS install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip install-ubinPROGRAMS \
-+	clean-ubinPROGRAMS clean-usbinPROGRAMS ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am info info-am install \
-+	install-am install-binPROGRAMS install-data install-data-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip install-ubinPROGRAMS \
- 	install-usbinPROGRAMS installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	tags uninstall uninstall-am uninstall-binPROGRAMS \
--	uninstall-info-am uninstall-ubinPROGRAMS \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
-+	pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-binPROGRAMS uninstall-info-am uninstall-ubinPROGRAMS \
- 	uninstall-usbinPROGRAMS
- 
- 
- install-exec-hook:
--	ln -sf newgrp	$(DESTDIR)$(bindir)/sg
- 	ln -sf vigr	$(DESTDIR)$(bindir)/vipw
- 	for i in $(suidbins); do \
- 		chmod 4755 $(DESTDIR)$(bindir)/$$i; \
-diff -Nru shadow-4.0.3/src/newgrp.c shadow-4.0.3_30.4/src/newgrp.c
---- shadow-4.0.3/src/newgrp.c	2002-01-06 16:00:07.000000000 +0100
-+++ shadow-4.0.3_30.4/src/newgrp.c	2004-11-02 22:17:38.000000000 +0100
-@@ -91,7 +91,7 @@
- 
- #if ENABLE_NLS
- 	/* XXX - remove when gettext is safe to use in setuid programs */
--	sanitize_env ();
-+	/* sanitize_env ();*/
- #endif
- 
- 	setlocale (LC_ALL, "");
-@@ -386,8 +386,13 @@
- 		SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'",
- 			 name, group));
- 	if (getdef_bool ("SYSLOG_SG_ENAB")) {
--		char *loginname = xstrdup (getlogin ());
--		char *tty = xstrdup (ttyname (0));
-+		char *loginname = getlogin ();
-+		char *tty = ttyname (0);
-+
-+		if (loginname != NULL)
-+		  loginname = xstrdup (loginname);
-+		if (tty != NULL)
-+		  tty = xstrdup (tty);
- 
- 		if (loginname == NULL)
- 			loginname = "???";
 diff -Nru shadow-4.0.3/src/newusers.c shadow-4.0.3_30.4/src/newusers.c
 --- shadow-4.0.3/src/newusers.c	2002-01-05 16:41:43.000000000 +0100
 +++ shadow-4.0.3_30.4/src/newusers.c	2004-11-02 22:17:38.000000000 +0100

--- 007_lib.dpatch DELETED ---