ncurses 5.7 - patch 20100703

[ncurses.git] / progs / Makefile.in

diff --git a/progs/Makefile.in b/progs/Makefile.in
index 5e211c281715616912391a0198859245b177f594..8eaf1cb4c26953a76b4f7d8e685ad29c0483b614 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.81 2009/03/14 18:45:55 tom Exp $
+# $Id: Makefile.in,v 1.84 2010/05/15 20:04:40 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -76,6 +76,9 @@ transform     = @program_transform_name@
 AWK            = @AWK@
 LN_S           = @LN_S@
 
+CTAGS          = @CTAGS@
+ETAGS          = @ETAGS@
+
 CC             = @CC@
 CPP            = @CPP@
 CFLAGS         = @CFLAGS@
@@ -176,7 +179,7 @@ transform.h :
        echo "#define __TRANSFORM_H 1"                                  >>$@
        echo "#include <progs.priv.h>"                                  >>$@
        echo "extern bool same_program(const char *, const char *);"    >>$@
-       -test -n "$x" && echo "#define SUFFIX_IGNORED \"$x\""           >>$@
+       -sh -c 'if test -n "$x" ; then echo "#define SUFFIX_IGNORED \"$x\"">>$@; fi'
        echo "#define PROG_CAPTOINFO \"$(define_captoinfo)\""           >>$@
        echo "#define PROG_INFOTOCAP \"$(define_infotocap)\""           >>$@
        echo "#define PROG_RESET     \"$(define_reset)\""               >>$@
@@ -214,7 +217,7 @@ uninstall.progs:
        -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
 
 $(DESTDIR)$(bindir) :
-       sh $(srcdir)/../mkdirs.sh $@
+       mkdir -p $@
 
 #
 # Utilities normally built by make all start here
@@ -275,10 +278,10 @@ termsort.c: $(srcdir)/MKtermsort.sh
 #
 
 tags:
-       ctags *.[ch]
+       $(CTAGS) *.[ch]
 
 @MAKE_UPPER_TAGS@TAGS:
-@MAKE_UPPER_TAGS@      etags *.[ch]
+@MAKE_UPPER_TAGS@      $(ETAGS) *.[ch]
 
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace