cpp/openttd-patchpack/source Changeset - r5555:ac01ca141cd7

Changeset - r5555:ac01ca141cd7

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

tron - 18 years ago 2007-01-07 08:17:56
tron@openttd.org

(svn r7939) Fix useless use of cat

2 files changed with 5 insertions and 5 deletions:

config.lib

configure

0 comments (0 inline, 0 general)

config.lib

➞

Show inline comments

@@ @@ -1173,13 +1173,13 @@ check_makedepend() { @@
 	res=`$makedepend -fmakedepend.tmp 2>/dev/null`
 	res=$?
 	log 2 "executing $makedepend -f makedepend.tmp"
 	log 2 "  returned `cat makedepend.tmp`"
 	log 2 "  exit code $ret"
-	if [ -z "`cat makedepend.tmp`" ]
+	if [ ! -s makedepend.tmp ]
 	then
 		rm -f makedepend.tmp makedepend.tmp.bak
 		if [ "$with_makedepend" = "2" ]
 		then
 			log 1 "checking makedepend... not found"
@@ @@ -1816,13 +1816,13 @@ generate_main() { @@
 	STAGE="[MAIN]"
 	make_sed
 	# Create the main Makefile
 	echo "Generating Makefile..."
-	cat $ROOT_DIR/Makefile.in | sed "$SRC_REPLACE" > Makefile
+	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
 	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
 	echo "" > Makefile.am
 	# Make the copy of the source-list, so we don't trigger an unwanted recompile
 	cp $SOURCE_LIST config.cache.source.list
 	# Make sure config.cache is OLDER then config.cache.source.list
 	touch config.cache
@@ @@ -1834,13 +1834,13 @@ generate_lang() { @@
 	make_sed
 	# Create the language file
 	mkdir -p $LANG_OBJS_DIR
 	echo "Generating lang/Makefile..."
-	cat $ROOT_DIR/Makefile.lang.in | sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
+	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
 	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
 	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
+}
 generate_src_normal() {
 	STAGE=$1
@@ @@ -1848,13 +1848,13 @@ generate_src_normal() { @@
 	make_sed
 	# Create the source file
 	mkdir -p $SRC_OBJS_DIR
 	echo "Generating $2/Makefile..."
-	cat $ROOT_DIR/Makefile.src.in | sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
+	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
 	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
 	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
+}
 generate_src_osx() {
 	cc_host_orig="$cc_host"

configure

➞

Show inline comments

@@ @@ -59,13 +59,13 @@ if ! [ -f "$LANG_DIR/english.txt" ] @@
 then
 	echo "Languages not found in $LANG_DIR. Can't continue without it."
 	echo "Please make sure the dir exists and contains at least english.txt"
 fi
 # Read the source.list and process it
-SRCS="`cat $ROOT_DIR/source.list | tr '\r' '\n' | awk '
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | awk '
 	{  }
 	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
 	/^(	*)#if/   {
 		gsub("	", "", $0);
 		gsub("^#if ", "", $0);

0 comments (0 inline, 0 general)