[Ultrapossum-cvs 16] ultrapossum ...

Back to archive index

Masato Taruishi taru****@users*****
2004年 4月 6日 (火) 03:07:12 JST


===================================================================
RCS file: ultrapossum/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/Makefile.am	2004/04/05 05:55:55	1.9
+++ ultrapossum/Makefile.am	2004/04/05 18:07:12	1.10
@@ -4,10 +4,15 @@
 bin_SCRIPTS = ultrapossum-config
 
 pkgdata_DATA = \
-	modules term
+	modules term variable
 
 aclocaldir = @aclocaldir@
 aclocal_DATA = ultrapossum.m4
+
+variable: modules
+	egrep "[A-Z_][A-Z_]*=" modules | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq > $@
+
+CLEANFILES = variable
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/$(PACKAGE)
===================================================================
RCS file: ultrapossum/ultrapossum-config.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ultrapossum/ultrapossum-config.in	2004/03/31 13:09:32	1.10
+++ ultrapossum/ultrapossum-config.in	2004/04/05 18:07:12	1.11
@@ -40,19 +40,14 @@
 	fi
 	for m in $modules 
 	do
-	  if ! /bin/ls $MODULEDIR/[0-9][0-9]$m > /dev/null 2> /dev/null; then
+	  if test -f "$MODULEDIR/$m/variable-$m"; then
+	    cat "$MODULEDIR/$m/variable-$m"
+	  else
 	    echo "E: No such module: $m" 1>&2
 	    exit 1
 	  fi
-	  /bin/ls $MODULEDIR/[0-9][0-9]$m 2> /dev/null | while read f
-	  do
-	      egrep "[A-Z_][A-Z_]*=" $f | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq | while read a
-	      do
-	        echo $a
-              done
-	  done
 	done
-        if test "x$1" = "x"; then egrep "[A-Z_][A-Z_]*=" $SHAREDIR/modules | cut -d= -f1 | grep -v IFS | tr -d ' ' | sort | uniq | while read a; do echo $a; done; fi
+        if test "x$1" = "x"; then cat $SHAREDIR/variable; fi
         ;;
     xget)
         shift



Ultrapossum-cvs メーリングリストの案内
Back to archive index