[uim-commit] r640 - trunk/scm

yamaken at freedesktop.org yamaken at freedesktop.org
Sun Feb 13 15:02:35 PST 2005


Author: yamaken
Date: 2005-02-13 15:02:30 -0800 (Sun, 13 Feb 2005)
New Revision: 640

Modified:
   trunk/scm/Makefile.am
Log:
* scm/Makefile.am
  - Replace 'echo' with $(ECHO)
  - Remove '-n' option of echo to avoid portability problem. Thanks
    Masanari Yamamoto for reporting


Modified: trunk/scm/Makefile.am
===================================================================
--- trunk/scm/Makefile.am	2005-02-13 16:34:26 UTC (rev 639)
+++ trunk/scm/Makefile.am	2005-02-13 23:02:30 UTC (rev 640)
@@ -64,18 +64,18 @@
 # TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
 installed-modules.scm: $(SCM_FILES)
 	$(MAKE) -C $(top_builddir)/uim uim-sh && \
-	echo -n >$@ && \
-	echo "(define installed-im-module-list '(" '$(module_names)' ")) \
+	$(ECHO) "(define installed-im-module-list '(" '$(module_names)' ")) \
 	      (require \"manage-modules.scm\") \
 	      (generate-installed-modules-scm)" \
 	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=$(top_srcdir)/scm LIBUIM_PLUGIN_LIB_DIR=$(top_srcdir)/uim/.libs \
-	  $(top_builddir)/uim/uim-sh -B >>$@
+	  $(top_builddir)/uim/uim-sh -B >$@
 
 # TODO: resolve dependency to $(top_builddir)/uim/uim-sh in proper way
 loader.scm: installed-modules.scm
 	$(MAKE) -C $(top_builddir)/uim uim-sh && \
-	echo -n >$@ && \
-	echo "(require \"manage-modules.scm\") \
+	$(ECHO) "(require \"manage-modules.scm\") \
 	      (generate-loader-scm)" \
 	| LIBUIM_VERBOSE=1 LIBUIM_VANILLA=1 LIBUIM_SCM_FILES=$(top_srcdir)/scm LIBUIM_PLUGIN_LIB_DIR=$(top_srcdir)/uim/.libs \
-	  $(top_builddir)/uim/uim-sh -B >>$@
+	  $(top_builddir)/uim/uim-sh -B >$@
+
+# $(ECHO) $(ECHO_N) >$@



More information about the Uim-commit mailing list