packages: apachetop/apachetop-log_location.patch, apachetop/apachetop.spec, ...

arekm arekm at pld-linux.org
Tue Nov 8 17:22:19 CET 2011


Author: arekm                        Date: Tue Nov  8 16:22:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; add debian patch

---- Files affected:
packages/apachetop:
   apachetop-log_location.patch (1.1 -> 1.2) , apachetop.spec (1.29 -> 1.30) , apachetop-debian.patch (NONE -> 1.1)  (NEW), apachetop-gcc4.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/apachetop/apachetop-log_location.patch
diff -u packages/apachetop/apachetop-log_location.patch:1.1 packages/apachetop/apachetop-log_location.patch:1.2
--- packages/apachetop/apachetop-log_location.patch:1.1	Sat Oct 18 13:21:34 2003
+++ packages/apachetop/apachetop-log_location.patch	Tue Nov  8 17:22:14 2011
@@ -1,11 +1,11 @@
---- ./src/apachetop.h.org	Wed Oct  8 18:46:38 2003
-+++ ./src/apachetop.h	Sat Oct 18 13:16:48 2003
-@@ -198,7 +198,7 @@
- #define DEBUG_OUTPUT "/tmp/atop.debug"
+--- apachetop-0.12.6/src/apachetop.h~	2011-11-08 17:17:58.000000000 +0100
++++ apachetop-0.12.6/src/apachetop.h	2011-11-08 17:18:22.621108652 +0100
+@@ -253,7 +253,7 @@
  
+ /* this can be overridden from config.h via ./configure --with-logfile .. */
  #ifndef DEFAULT_LOGFILE
--# define DEFAULT_LOGFILE "/var/httpd/apache_log"
-+# define DEFAULT_LOGFILE "/var/log/httpd/access_log"
+-# define DEFAULT_LOGFILE "/var/log/apache2/access.log"
++# define DEFAULT_LOGFILE "/var/log/httpd/access.log"
  #endif
- #define DEFAULT_LOGTYPE LOG_COMMON
  #define DEFAULT_CIRCLE_SIZE 30
+ #define DEFAULT_CIRCLE_MODE TIMED_CIRCLE

================================================================
Index: packages/apachetop/apachetop.spec
diff -u packages/apachetop/apachetop.spec:1.29 packages/apachetop/apachetop.spec:1.30
--- packages/apachetop/apachetop.spec:1.29	Sun Apr 12 23:35:05 2009
+++ packages/apachetop/apachetop.spec	Tue Nov  8 17:22:14 2011
@@ -6,14 +6,14 @@
 Summary(pl.UTF-8):	Podobny do topa program pokazujący pracę Apache'a
 Name:		apachetop
 Version:	0.12.6
-Release:	4
+Release:	5
 Epoch:		1
 License:	BSD
 Group:		Networking/Utilities
 Source0:	http://www.webta.org/apachetop/%{name}-%{version}.tar.gz
 # Source0-md5:	604283ac4bbbddd98fc9b1f11381657e
-Patch0:		%{name}-log_location.patch
-Patch1:		%{name}-gcc4.patch
+Patch0:		%{name}-debian.patch
+Patch1:		%{name}-log_location.patch
 Patch2:		%{name}-maxpath.patch
 URL:		http://www.webta.org/projects/apachetop/
 BuildRequires:	ncurses-devel
@@ -40,11 +40,14 @@
 sed -i -e 's#fam#fambroken#g' configure*
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses -pthread"
+	CXXFLAGS="%{rpmcflags} %{rpmcppflags} -I/usr/include/ncurses -pthread"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/11/08 16:22:14  arekm
+- rel 5; add debian patch
+
 Revision 1.29  2009/04/12 21:35:05  arekm
 - rel 4; fix max path overflow
 

================================================================
Index: packages/apachetop/apachetop-debian.patch
diff -u /dev/null packages/apachetop/apachetop-debian.patch:1.1
--- /dev/null	Tue Nov  8 17:22:19 2011
+++ packages/apachetop/apachetop-debian.patch	Tue Nov  8 17:22:14 2011
@@ -0,0 +1,6579 @@
+Author: n/a
+Description: Needs to be broken out (FIXME).
+
+diff -Naurp apachetop.orig/Makefile.in apachetop/Makefile.in
+--- apachetop.orig/Makefile.in	2009-07-16 21:43:27.000000000 +0000
++++ apachetop/Makefile.in	2009-07-16 21:46:39.000000000 +0000
+@@ -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,62 +14,96 @@
+ 
+ @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 = :
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ HAVE_READLINE = @HAVE_READLINE@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
+ VERSION = @VERSION@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_STRIP = @ac_ct_STRIP@
++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_alias = @build_alias@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++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@
+ 
+ SUBDIRS = man src config
+ 
+@@ -84,25 +119,27 @@ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+ DIST_SOURCES =
+ 
+-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+-	uninstall-info-recursive all-recursive install-data-recursive \
+-	install-exec-recursive installdirs-recursive install-recursive \
+-	uninstall-recursive check-recursive installcheck-recursive
+-DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
+-	Makefile.am Makefile.in NEWS TODO aclocal.m4 config.h.in \
+-	configure configure.ac
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
++	COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
++	config.h.in configure configure.ac
+ DIST_SUBDIRS = $(SUBDIRS)
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
++
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu  Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) && \
+-	  CONFIG_HEADERS= CONFIG_LINKS= \
+-	  CONFIG_FILES=$@ $(SHELL) ./config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
+ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+@@ -111,31 +148,23 @@ $(srcdir)/configure:  $(srcdir)/configur
+ 
+ $(ACLOCAL_M4):  configure.ac 
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+-config.h: stamp-h
+-	@if test ! -f $@; then \
+-		rm -f stamp-h; \
+-		$(MAKE) stamp-h; \
+-	else :; fi
+-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+-	@rm -f stamp-h stamp-hT
+-	@echo timestamp > stamp-hT 2> /dev/null
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+-	     $(SHELL) ./config.status
+-	@mv stamp-hT stamp-h
+-$(srcdir)/config.h.in:  $(srcdir)/./stamp-h.in
++
++config.h: stamp-h1
+ 	@if test ! -f $@; then \
+-		rm -f $(srcdir)/./stamp-h.in; \
+-		$(MAKE) $(srcdir)/./stamp-h.in; \
++	  rm -f stamp-h1; \
++	  $(MAKE) stamp-h1; \
+ 	else :; fi
+-$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+-	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
+-	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
++
++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
++	@rm -f stamp-h1
++	cd $(top_builddir) && $(SHELL) ./config.status config.h
++
++$(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+-	@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
++	touch $(srcdir)/config.h.in
+ 
+ distclean-hdr:
+-	-rm -f config.h
++	-rm -f config.h stamp-h1
+ uninstall-info-am:
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -145,7 +174,7 @@ uninstall-info-am:
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -165,7 +194,7 @@ $(RECURSIVE_TARGETS):
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	case "$@" in \
+ 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -192,71 +221,119 @@ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ 	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
++
++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: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if (etags --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	else \
++	  include_option=--include; \
++	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++	    test -f $$subdir/TAGS && \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ 	  fi; \
+ 	done; \
+-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
++	list='$(SOURCES) $(HEADERS) config.h.in $(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)$$tags$$unique" \
++	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	     $$tags $$unique
++
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS) config.h.in $(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)config.h.in$$unique$(LISP)$$tags" \
+-	  || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
++	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 = .
+-# Avoid unsightly `./'.
+ distdir = $(PACKAGE)-$(VERSION)
+ 
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++
+ GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+ 
+ distdir: $(DISTFILES)
+-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
++	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	@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 \
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+-	for subdir in $(SUBDIRS); do \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+ 	    test -d $(distdir)/$$subdir \
+ 	    || mkdir $(distdir)/$$subdir \
+@@ -274,41 +351,70 @@ distdir: $(DISTFILES)
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ 	|| chmod -R a+r $(distdir)
+-dist: distdir
++dist-gzip: distdir
++	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++dist dist-all: distdir
+ 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
++	$(am__remove_distdir)
+ 
+ # This target untars the dist file and tries a VPATH configuration.  Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+-	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
++	$(am__remove_distdir)
+ 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ 	chmod -R a-w $(distdir); chmod a+w $(distdir)
+-	mkdir $(distdir)/=build
+-	mkdir $(distdir)/=inst
++	mkdir $(distdir)/_build
++	mkdir $(distdir)/_inst
+ 	chmod a-w $(distdir)
+-	dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
+-	  && cd $(distdir)/=build \
+-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
++	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
++	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
++	  && cd $(distdir)/_build \
++	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	    $(DISTCHECK_CONFIGURE_FLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) check \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) install \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+-	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+-	     || (echo "Error: files left after uninstall" 1>&2; \
+-	         exit 1) ) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+-	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
++	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
++	        distuninstallcheck \
++	  && chmod -R a-w "$$dc_install_base" \
++	  && ({ \
++	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
++	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
++	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
++	  && rm -rf "$$dc_destdir" \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ 	  && rm -f $(distdir).tar.gz \
+-	  && (test `find . -type f -print | wc -l` -eq 0 \
+-	     || (echo "Error: files left after distclean" 1>&2; \
+-	         exit 1) )
+-	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
++	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++	$(am__remove_distdir)
+ 	@echo "$(distdir).tar.gz is ready for distribution" | \
+ 	  sed 'h;s/./=/g;p;x;p;x'
++distuninstallcheck:
++	@cd $(distuninstallcheck_dir) \
++	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++	   || { echo "ERROR: files left after uninstall:" ; \
++	        if test -n "$(DESTDIR)"; then \
++	          echo "  (check DESTDIR support)"; \
++	        fi ; \
++	        $(distuninstallcheck_listfiles) ; \
++	        exit 1; } >&2
++distcleancheck: distclean
++	@if test '$(srcdir)' = . ; then \
++	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
++	  exit 1 ; \
++	fi
++	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++	  || { echo "ERROR: files left in build directory after distclean:" ; \
++	       $(distcleancheck_listfiles) ; \
++	       exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+ all-am: Makefile config.h
+@@ -326,6 +432,7 @@ install-am: all-am
+ installcheck: installcheck-recursive
+ 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:
+@@ -333,7 +440,7 @@ mostlyclean-generic:
+ 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"
+@@ -343,11 +450,9 @@ clean: clean-recursive
+ 
+ clean-am: clean-generic mostlyclean-am
+ 
+-dist-all: distdir
+-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+ distclean: distclean-recursive
+-	-rm -f config.status config.cache config.log
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -f Makefile
+ distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+ 
+ dvi: dvi-recursive
+@@ -369,31 +474,43 @@ install-man:
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+-
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -rf $(top_srcdir)/autom4te.cache
++	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-generic
+ 
++pdf: pdf-recursive
++
++pdf-am:
++
++ps: ps-recursive
++
++ps-am:
++
+ uninstall-am: uninstall-info-am
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apachetop/apachetop-log_location.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apachetop/apachetop.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list