[Ultrapossum-cvs 1064] ultrapossum/module ...

Back to archive index

Masato Taruishi taru****@users*****
2004年 10月 30日 (土) 03:38:54 JST


===================================================================
RCS file: ultrapossum/module/ultrapossum.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/ultrapossum.am	2004/05/14 11:01:07	1.4
+++ ultrapossum/module/ultrapossum.am	2004/10/29 18:38:54	1.5
@@ -10,15 +10,44 @@
 
 # $Id$
 
-moduledir = $(pkgdatadir)/module.d
-updatedir = $(pkgdatadir)/update.d
+moduledir = @MODULEDIR@
+updatedir = @UPDATEDIR@
 modulelocaldir = $(moduledir)/$(modulename)
 variabledir = $(modulelocaldir)
-modulesysconfdir = $(sysconfdir)/$(PACKAGE)/module.d/
+modulesysconfdir = @MODULECONFDIR@
+testdir = @TESTSCRIPTSDIR@
 
-variable_DATA = variable-$(modulename)
+mkvariable=$(shell if test -x "@top_srcdir@/mkvariable"; then echo "@top_srcdir@/mkvariable"; else echo "@SHAREDIR@/mkvariable"; fi )
+
+variable_DATA = variable-$(modulename) pysical-$(modulename) logical-$(modulename) secret-$(modulename)
 $(variable_DATA): $(module_DATA)
-	egrep "[A-Z_][A-Z_]*=" $(module_DATA) | cut -d= -f1 | grep -v IFS | tr -d '# ' | sort | uniq > $@
+	$(mkvariable) variable $(srcdir)/$(module_DATA) > variable-$(modulename)
+	$(mkvariable) pysical $(srcdir)/$(module_DATA) > pysical-$(modulename)
+	$(mkvariable) logical $(srcdir)/$(module_DATA) > logical-$(modulename)
+	$(mkvariable) secret $(srcdir)/$(module_DATA) > secret-$(modulename)
 
 CLEANFILES = $(variable_DATA)
+
+install-modulesysconfDATA: $(modulesysconf_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(modulesysconfdir)
+	@list='$(modulesysconf_DATA)'; for p in $$list; do \
+	if test -f $(srcdir)/$$p; then \
+	  if test -f $(DESTDIR)/$(modulesysconfdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesysconfdir)/$$p.new"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesysconfdir)/$$p.new; \
+	  else \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesysconfdir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesysconfdir)/$$p; \
+	  fi; \
+	else if test -f $$p; then \
+	  if test -f $(DESTDIR)/$(modulesysconfdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(modulesysconfdir)/$$p.new"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(modulesysconfdir)/$$p.new; \
+	  else \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(modulesysconfdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(modulesysconfdir)/$$p; \
+	  fi; \
+	fi; fi; \
+	done
 



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