Преглед изворни кода

make sure makeinfo is not run (because it is run unconditionally and actually not needed at all) and remove some hacks from the past which are no longer needed

Ralf S. Engelschall пре 21 година
родитељ
комит
bf6a7a5d49
2 измењених фајлова са 34 додато и 3 уклоњено
  1. 33 0
      coreutils/coreutils.patch
  2. 1 3
      coreutils/coreutils.spec

+ 33 - 0
coreutils/coreutils.patch

@@ -229,3 +229,36 @@
      {
        error (0, 0, _("`-%lu' option is obsolete; use `-f %lu'"),
  	     (unsigned long) skip_fields, (unsigned long) skip_fields);
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig	2004-03-11 09:57:59.000000000 +0100
++++ doc/Makefile.in	2004-04-21 15:11:16.000000000 +0200
+@@ -319,29 +319,6 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ .texi.info:
+-	restore=: && \
+-	backupdir="$(am__leading_dot)am$$$$" && \
+-	am__cwd=`pwd` && cd $(srcdir) && \
+-	rm -rf $$backupdir && mkdir $$backupdir && \
+-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+-	  if test -f $$f; then \
+-	    mv $$f $$backupdir; \
+-	    restore=mv; \
+-	  fi; \
+-	done; \
+-	cd "$$am__cwd"; \
+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<; \
+-	then \
+-	  rc=0; \
+-	  cd $(srcdir); \
+-	else \
+-	  rc=$$?; \
+-	  cd $(srcdir) && \
+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+-	fi; \
+-	rm -rf $$backupdir; \
+-	exit $$rc
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

+ 1 - 3
coreutils/coreutils.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Utility
 License:      GPL
 Version:      %{V_release}
-Release:      20040324
+Release:      20040421
 
 #   package options
 %option       with_legacy  no
@@ -90,7 +90,6 @@ AutoReqProv:  no
         -e 's;^\(install-exec-local:\).*;\1;' \
         -e 's;^\(bin_PROGRAMS =\);\1 su;' \
         src/Makefile.in
-    ( cd man && touch nice.1 stat.1 test.1 ls.1 dir.1 vdir.1 ) || exit 1
 
 %build
     CC="%{l_cc}" \
@@ -103,7 +102,6 @@ AutoReqProv:  no
         --prefix=%{l_prefix} \
         --program-prefix=g \
         --disable-nls
-    chmod a+rx config/install-sh
     %{l_make} %{l_mflags -O}
 
 %install