Changeset 2266
- Timestamp:
- Jun 6, 2010, 1:14:58 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build_support/Makefile.am
r2264 r2266 53 53 -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ 54 54 -e 's|@PACKAGE_URL[@]|$(PACKAGE_URL)|g' \ 55 -e 's|@ECHO[@]|$(ECHO)|g' \56 55 -e 's|@VERSION[@]|$(VERSION)|g' \ 57 56 -e 's|@YAT_MAJOR_VERSION[@]|$(YAT_MAJOR_VERSION)|g' \ … … 66 65 yat-config: Makefile $(srcdir)/yat-config.in 67 66 @rm -f $@ $@.tmp 68 @ $(ECHO)"#! $(SHELL)" > $@.tmp69 @ $(ECHO)"# $@ generated by make from yat-config.in" >> $@.tmp67 @echo "#! $(SHELL)" > $@.tmp 68 @echo "# $@ generated by make from yat-config.in" >> $@.tmp 70 69 @$(edit) '$(srcdir)/$@.in' >>$@.tmp 71 70 @chmod +x $@.tmp 72 71 @chmod a-w $@.tmp 73 72 @mv $@.tmp $@ 74 @ $(ECHO)creating $@73 @echo creating $@ 75 74 76 75 yat.pc: Makefile $(srcdir)/yat.pc.in 77 76 @rm -f $@ $@.tmp 78 @ $(ECHO)"# $@ generated by make from yat.pc.in" > $@.tmp77 @echo "# $@ generated by make from yat.pc.in" > $@.tmp 79 78 @$(edit) '$(srcdir)/$@.in' >>$@.tmp 80 79 @chmod a-w $@.tmp 81 80 @mv $@.tmp $@ 82 @ $(ECHO)creating $@81 @echo creating $@ 83 82 84 83 install-exec-hook: -
trunk/build_support/yat-config.in
r2264 r2266 93 93 case "$1" in 94 94 --prefix) 95 @ECHO@$prefix95 echo $prefix 96 96 exit 0 97 97 ;; 98 98 --bindir) 99 @ECHO@$bindir99 echo $bindir 100 100 exit 0 101 101 ;; 102 102 --includedir) 103 @ECHO@$includedir103 echo $includedir 104 104 exit 0 105 105 ;; 106 106 --libdir) 107 @ECHO@$libdir107 echo $libdir 108 108 exit 0 109 109 ;; 110 110 --cxx) 111 @ECHO@$CXX111 echo $CXX 112 112 exit 0 113 113 ;; 114 114 --cxxcpp) 115 @ECHO@$CXXCPP115 echo $CXXCPP 116 116 exit 0 117 117 ;; … … 165 165 ;; 166 166 --atleast-version=*) 167 optarg=` @ECHO@"$1" | sed 's/--atleast-version=//'`168 min_major=` @ECHO@"$optarg" | sed 's/\([0-9]*\).*/\1/'`167 optarg=`echo "$1" | sed 's/--atleast-version=//'` 168 min_major=`echo "$optarg" | sed 's/\([0-9]*\).*/\1/'` 169 169 if test "$optarg" = "$min_major"; then 170 170 min_minor="0"; 171 171 else 172 min_minor=` @ECHO@"$optarg" | sed 's/[0-9]*.\([0-9]*\).*/\1/'`172 min_minor=`echo "$optarg" | sed 's/[0-9]*.\([0-9]*\).*/\1/'` 173 173 fi 174 174 if test "$optarg" = "$min_major.$min_minor"; then 175 175 min_patch="0"; 176 176 else 177 min_patch=` @ECHO@"$optarg" | sed 's/[0-9]*.[0-9]*.\([0-9]*\).*/\1/'`177 min_patch=`echo "$optarg" | sed 's/[0-9]*.[0-9]*.\([0-9]*\).*/\1/'` 178 178 fi 179 179 if test "$optarg" = "$min_patch"; then … … 198 198 ;; 199 199 --version) 200 @ECHO@@VERSION@200 echo @VERSION@ 201 201 exit 0 202 202 ;; 203 203 --version-major) 204 @ECHO@@YAT_MAJOR_VERSION@204 echo @YAT_MAJOR_VERSION@ 205 205 exit 0 206 206 ;; 207 207 --version-minor) 208 @ECHO@@YAT_MINOR_VERSION@208 echo @YAT_MINOR_VERSION@ 209 209 exit 0 210 210 ;; 211 211 --version-patch) 212 @ECHO@@YAT_PATCH_VERSION@212 echo @YAT_PATCH_VERSION@ 213 213 exit 0 214 214 ;; … … 243 243 fi 244 244 done 245 @ECHO@$unique_flags245 echo $unique_flags 246 246 fi 247 247 -
trunk/configure.ac
r2264 r2266 80 80 AC_PROG_SED 81 81 AC_PROG_LIBTOOL 82 # fall back to echo unless ECHO not already set (by libtool)83 AS_IF([test "x$ECHO" = x], [ECHO=echo])84 AC_SUBST(ECHO)85 82 86 83 AC_MSG_NOTICE(dnl -
trunk/doc/Makefile.am
r2224 r2266 79 79 80 80 $(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS) 81 @(cat doxygen.config && $(ECHO)"INPUT = $(DOXYGEN_INPUT)" && \82 $(ECHO)GENERATE_HTML = YES) | $(DOXYGEN) -;81 (cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \ 82 echo GENERATE_HTML = YES) | $(DOXYGEN) -; 83 83 84 84 $(DX_LATEX_OUTPUT)/refman.tex: $(DOXYGEN_DEPS) 85 @(cat doxygen.config && $(ECHO)"INPUT = $(DOXYGEN_INPUT)" && \86 $(ECHO)GENERATE_LATEX = YES) | $(DOXYGEN) -;85 @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \ 86 echo GENERATE_LATEX = YES) | $(DOXYGEN) -; 87 87 88 88 $(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex … … 132 132 test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\ 133 133 $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \ 134 $(ECHO)"$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\134 echo "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\ 135 135 fi 136 136 … … 139 139 test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\ 140 140 $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \ 141 $(ECHO)"$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\141 echo "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\ 142 142 fi 143 143 … … 146 146 test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\ 147 147 $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \ 148 $(ECHO)"$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\148 echo "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\ 149 149 fi 150 150
Note: See TracChangeset
for help on using the changeset viewer.