Install should be more portable now

Author: jeaye

Makefile.in

@@ -32,51 +32,45 @@ CXX_FLAGS=-std=c++11 $(CXX_WARN) $(CXX_NOWARN) $(CXX_OPT) $(CXX_INCLUDE) $(CXX_P
 LD_PLATFORM_LIBS=%LD_PLATFORM_LIBS_IN%
 LD_LIBS=-lcurl $(LD_PLATFORM_LIBS)
 
-COLOR_OFF="$(shell tput sgr0)"
-COLOR_GREEN="$(shell tput setaf 2)"
-ECHO_PREFIX="$(COLOR_GREEN)»»»$(COLOR_OFF)"
-
 .PHONY: all setup clean stdman stdman_setup stdman_link
 
 .SILENT:
 
 all: setup stdman
-	echo "$(ECHO_PREFIX) Success"
+	echo "Success"
 
 setup: clean
-	echo "$(ECHO_PREFIX) Preparing"
+	echo "Preparing"
 	mkdir -p obj bin man tmp
 
 clean:
 	rm -f bin/stdman
 	rm -rf $(OBJ_DIR)
-	echo "$(ECHO_PREFIX) Cleaned"
+	echo "Cleaned"
 
 stdman: setup stdman_link
-	echo "$(ECHO_PREFIX) Done building stdman"
+	echo "Done building stdman"
 
 stdman_setup: setup
-	echo "$(ECHO_PREFIX) Building stdman"
+	echo "Building stdman"
 
 stdman_link: stdman_setup $(OBJECTS)
-	echo "  $(ECHO_PREFIX) Linking"
+	echo "  Linking"
 	$(CXX) -o $(BIN) $(BIN_OBJECTS) $(LD_LIBS)
 
 %.cpp.o: %.cpp setup
-	echo "  $(ECHO_PREFIX) Compiling $<"
+	echo "  Compiling $<"
 	mkdir -p $(addprefix $(OBJ_DIR),$(dir $<))
 	$(CXX) $(CXX_FLAGS) $< -o $(addsuffix .o,$(addprefix $(OBJ_DIR), $<))
 
 generate: stdman
-	export echo_prefix=$(ECHO_PREFIX) &&\
 	export tmp_man=$(TMP_MAN) &&\
 	export reference=$(REFERENCE) &&\
 	export threads=$(THREADS) &&\
 	./do_generate
 	rm -f $(TMP_MAN)/*.html
 
 install:
-	export echo_prefix=$(ECHO_PREFIX) &&\
 	export tmp_man=$(TMP_MAN) &&\
 	export reference=$(REFERENCE) &&\
 	export mandir=$(DESTDIR)/$(MANDIR) &&\

configure

@@ -39,23 +39,8 @@ else
   exit 1
 fi
 
-# Colors
-COLOR_OFF="$(tput sgr0)"
-COLOR_RED="$(tput setaf 1)"
-COLOR_YELLOW="$(tput setaf 3)"
-COLOR_GREEN="$(tput setaf 2)"
-
-# Output colorizing
-ECHO_PREFIX=$COLOR_GREEN"»»»"$COLOR_OFF
-if [ "$UNAME" = "Linux" ];
-then
-  ECHO="echo -e $ECHO_PREFIX"
-else
-  ECHO="echo $ECHO_PREFIX"
-fi
-
-log() { $ECHO "$@" 1>&2; }
-log_start() { printf "$ECHO_PREFIX $@" 1>&2; }
+log() { echo "$@" 1>&2; }
+log_start() { printf "$@" 1>&2; }
 log_end() { echo "$@" 1>&2; }
 
 PROJECT=stdman

do_generate

@@ -10,40 +10,36 @@
 # XXX: Do not call this script directly: use `make generate`
 set -o nounset
 
-# colors
-color_off=$(tput sgr0)
-color_red=$(tput setaf 1)
-
 function check_existence 
 {
-  printf "$echo_prefix Checking for $1... "
+  printf "Checking for $1... "
   which $1 > /dev/null 2>&1
   exists=$?
   if [ "$exists" -eq "0" ];
   then
     echo "found" 1>&2
   else
-    echo "${color_red}not found${color_off}; make sure it's in PATH" 1>&2
-    echo "${color_red}Error: ${color_off}manual generation will not work"
+    echo "not found; make sure it's in PATH" 1>&2
+    echo "Error: manual generation will not work"
     exit 1
   fi
 }
 
 check_existence "elinks"
 check_existence "gzip"
 
-echo "$echo_prefix Generating from $reference to $tmp_man"
-echo "  $echo_prefix Removing previous files"
+echo "Generating from $reference to $tmp_man"
+echo "  Removing previous files"
 rm -f $tmp_man/*.3
-echo "  $echo_prefix Parsing documentation on $threads threads"
+echo "  Parsing documentation on $threads threads"
 find $reference -name '*.html' -print0 | xargs -0 -n 1 -P $threads -I % \
 ./bin/stdman -d $tmp_man % > /dev/null 2>&1
 
-echo "  $echo_prefix Removing unwanted pages"
+echo "  Removing unwanted pages"
 for file in $(find $tmp_man -name '*.3' | grep -v "std::") ; do
   rm -f $file;
 done
 
-echo "  $echo_prefix Creating links for common typedefs"
+echo "  Creating links for common typedefs"
 ./do_link
-echo "$echo_prefix Done generating"
+echo "Done generating"

do_install

@@ -11,11 +11,11 @@
 set -o errexit
 set -o nounset
 
-echo "$echo_prefix Installing from $tmp_man to $mandir/man3"
+echo "Installing from $tmp_man to $mandir/man3"
 mkdir -p $mandir/man3
 for file in "$tmp_man"/*.3 ; do
   out=$mandir/man3/$(basename "$file");
   install -g 0 -o 0 -m 0644 "$file" "$out";
   gzip -f "$out";
 done
-echo "$echo_prefix Done"
+echo "Done"