[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[orca-dev:00309] FYI: patch for Makefiles

To: orca-dev@xxxxxxxxxxxxxx
Subject: [orca-dev:00309] FYI: patch for Makefiles
From: Tomohiro 'Tomo-p' KATO <tomop@xxxxxxxxxxxxx>
Date: Tue, 24 Dec 2002 17:39:33 +0900
　こんにちは、加藤です。

　　動作には関係のないことですが、Vine Linux 上でパッケージングしていて
　変更した部分の patch （12/10 の CVS HEAD に対するもの）を末尾につけま
　すので参考までにご覧ください。

　　COBOL ソースには手をつけていませんが（こちらではスクリプトで機械的
　かつ相当 ad hoc に変更）、後々は 'scriptsdir' 等に全て置き換わるもの
　と期待しています。

　　大まかな変更点は以下の通りです。

　(1) autoconf 周りの変数の使い方を変更
　　　・prefix / libdir / datadir は本来の用途に返却

　(2) FHS 的ファイル配置ができるように変更
　　　・ファイルを用途に応じて libdir / libexecdir / datadir に割り振り


　　configure のオプションは以下を追加・置換すれば現状の deb と同じもの
　になるようにしたつもりです。

 --prefix=/usr
 --libexecdir=/usr/lib
 --datadir=/usr/lib


------------------------------------------------------------------------
diff -urN jma-receipt.orig/Makefile.directories.in jma-receipt/Makefile.directories.in
--- jma-receipt.orig/Makefile.directories.in	1970-01-01 09:00:00.000000000 +0900
+++ jma-receipt/Makefile.directories.in	2002-12-10 16:46:45.000000000 +0900
@@ -0,0 +1,46 @@
+prefix = @prefix@
+exec_prefix= @exec_prefix@
+libdir = @libdir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+sysconfdir = @sysconfdir@
+
+ORCA_LIBDIR = ${libdir}/@PACKAGE@
+ORCA_LIBEXECDIR = ${libexecdir}/@PACKAGE@
+ORCA_DATADIR = ${datadir}/@PACKAGE@
+
+orcalibdir = ${ORCA_LIBDIR}
+docdir = ${ORCA_DATADIR}/doc
+orcadatadir = ${ORCA_DATADIR}/data
+formdir = ${ORCA_DATADIR}/form
+initdir = ${ORCA_LIBEXECDIR}/init
+lddefdir = ${ORCA_DATADIR}/lddef
+recorddir = ${ORCA_DATADIR}/record
+screendir = ${ORCA_DATADIR}/screen
+scriptsdir = ${ORCA_LIBEXECDIR}/scripts
+copydir = ${ORCA_DATADIR}/cobol/copy
+
+COPYGEN = @COPYGEN@
+
+SITEDIR = @sitedir@
+SITESRCDIR = @sitesrcdir@
+SITELIBDIR = @sitelibdir@
+SITELIBEXECDIR = @sitelibexecdir@
+
+SITECOPYDIR = ${SITEDIR}/cobol/copy
+SITEDATADIR = ${SITEDIR}/data
+SITEFORMDIR = ${SITEDIR}/form
+SITEINITDIR = ${SITELIBEXECDIR}/init
+SITELDDEFDIR = ${SITEDIR}/lddef
+SITERECORDDIR = ${SITEDIR}/record
+SITESCREENDIR = ${SITEDIR}/screen
+SITESCRIPTSDIR = ${SITELIBEXECDIR}/scripts
+
+allwaysscripts = ${scriptsdir}/allways
+dailyscripts = ${scriptsdir}/daily
+monthlyscripts = ${scriptsdir}/monthly
+printscripts = ${scriptsdir}/daily/print-data.rb
+
diff -urN jma-receipt.orig/Makefile.in jma-receipt/Makefile.in
--- jma-receipt.orig/Makefile.in	2002-12-09 22:59:43.000000000 +0900
+++ jma-receipt/Makefile.in	2002-12-10 16:48:20.000000000 +0900
@@ -1,22 +1,9 @@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-sysconfdir = @sysconfdir@
-
 top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
 
-ORCA_DIR = ${exec_prefix}
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
 
-docdir = ${ORCA_DIR}/doc
-datadir = ${ORCA_DIR}/data
-formdir = ${ORCA_DIR}/form
-initdir = ${ORCA_DIR}/init
-lddefdir = ${ORCA_DIR}/lddef
-recorddir = ${ORCA_DIR}/record
-screendir = ${ORCA_DIR}/screen
-scriptsdir = ${ORCA_DIR}/scripts
 
 SUBDIRS = etc screen form record lddef cobol scripts init data doc tools
 
diff -urN jma-receipt.orig/cobol/Makefile.global.in jma-receipt/cobol/Makefile.global.in
--- jma-receipt.orig/cobol/Makefile.global.in	2002-12-05 20:39:25.000000000 +0900
+++ jma-receipt/cobol/Makefile.global.in	2002-12-10 16:44:33.000000000 +0900
@@ -1,23 +1,5 @@
-prefix = @prefix@
-exec_prefix= @exec_prefix@
+include $(top_builddir)/Makefile.directories
 
-sysconfdir = @sysconfdir@
-
-ORCA_DIR = ${exec_prefix}
-
-docdir = ${ORCA_DIR}/doc
-datadir = ${ORCA_DIR}/data
-formdir = ${ORCA_DIR}/form
-initdir = ${ORCA_DIR}/init
-lddefdir = ${ORCA_DIR}/lddef
-recorddir = ${ORCA_DIR}/record
-screendir = ${ORCA_DIR}/screen
-scriptsdir = ${ORCA_DIR}/scripts
-copydir = ${ORCA_DIR}/cobol/copy
-
-libdir  = @libdir@
-
-srcdir = @srcdir@
 
 COBOL = @COBC@
 INSTALL = @INSTALL@
@@ -77,11 +59,11 @@
 
 install: all installdirs
 	for f in $(COBJS) $(OBJS) $(EXEC); do \
-	  $(INSTALL) -m 555 $${f} $(libdir) ; done
+	  $(INSTALL) -m 555 $${f} $(orcalibdir) ; done
 
 installdirs:
-	-@if [ ! -d $(libdir) ]; then \
-	  $(MKDIR) $(libdir); \
+	-@if [ ! -d $(orcalibdir) ]; then \
+	  $(MKDIR) $(orcalibdir); \
 	fi
 
 install-copys: install-copydirs
diff -urN jma-receipt.orig/cobol/copy/CPHOMEDIR.INC.in jma-
receipt/cobol/copy/CPHOMEDIR.INC.in
--- jma-receipt.orig/cobol/copy/CPHOMEDIR.INC.in	2002-10-28 13:39:42.000000000 +0900
+++ jma-receipt/cobol/copy/CPHOMEDIR.INC.in	2002-12-10 17:19:53.000000000 +0900
@@ -25,7 +25,7 @@
       ************************************************************
        01  HOMEDIR-AREA.
            03  HOMEDIR-NAME             PIC X(100)   VALUE
-               "@prefix@/".
+               "@ORCA_DATADIR@/".
       *    サイトホーム
            03  HOMEDIR-SITE-NAME        PIC X(100)   VALUE
                "@sitedir@/".
diff -urN jma-receipt.orig/cobol/copy/Makefile.in jma-receipt/cobol/copy/Makefile.in
--- jma-receipt.orig/cobol/copy/Makefile.in	2002-12-09 15:17:08.000000000 +0900
+++ jma-receipt/cobol/copy/Makefile.in	2002-12-10 17:20:53.000000000 +0900
@@ -1,3 +1,7 @@
+top_builddir = ../..
+include $(top_builddir)/Makefile.directories
+
+
 COPYS_sources = \
 	CPHOMEDIR.INC.in \
 	CPCOMMONSHELL.INC.in \
@@ -600,43 +604,6 @@
 MCPAREA = \
 	MCPAREA 
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-
-sysconfdir = @sysconfdir@
-
-ORCA_DIR = ${exec_prefix}
-
-docdir = ${ORCA_DIR}/doc
-datadir = ${ORCA_DIR}/data
-formdir = ${ORCA_DIR}/form
-initdir = ${ORCA_DIR}/init
-lddefdir = ${ORCA_DIR}/lddef
-recorddir = ${ORCA_DIR}/record
-screendir = ${ORCA_DIR}/screen
-scriptsdir = ${ORCA_DIR}/scripts
-copydir = ${ORCA_DIR}/cobol/copy
-libdir  = @libdir@
-
-COPYGEN = @COPYGEN@
-
-SITEDIR = @sitedir@
-SITESRCDIR = @sitesrcdir@
-SITELIBDIR = @sitelibdir@
-
-SITECOPYDIR = ${SITEDIR}/cobol/copy
-SITEDATADIR = ${SITEDIR}/data
-SITEFORMDIR = ${SITEDIR}/form
-SITEINITDIR = ${SITEDIR}/init
-SITELDDEFDIR = ${SITEDIR}/lddef
-SITERECORDDIR = ${SITEDIR}/record
-SITESCREENDIR = ${SITEDIR}/screen
-SITESCRIPTSDIR = ${SITEDIR}/scripts
-
-allwaysscripts = ${scriptsdir}/allways
-dailyscripts = ${scriptsdir}/daily
-monthlyscripts = ${scriptsdir}/monthly
-printscripts = ${scriptsdir}/daily/print-data.rb
 
 COBOL = @COBC@
 INSTALL = @INSTALL@
@@ -660,6 +627,9 @@
 	printscripts_len=`echo -n $(printscripts)|wc -c|sed -e "s/ //g"` &&\
 	sed -e 's,\@prefix\@,$(prefix),g' \
 	    -e 's,\@sitedir\@,$(SITEDIR),g' \
+	    -e 's,\@ORCA_DATADIR\@,$(ORCA_DATADIR),g' \
+	    -e 's,\@orcalibdir\@,$(orcalibdir),g' \
+	    -e 's,\@orcadatadir\@,$(orcadatadir),g' \
 	    -e 's,\@formdir\@,$(formdir)/,g' \
 	    -e 's,\@recorddir\@,$(recorddir)/,g' \
 	    -e 's,\@scriptsdir\@,$(scriptsdir)/,g' \
diff -urN jma-receipt.orig/configure.in jma-receipt/configure.in
--- jma-receipt.orig/configure.in	2002-12-09 22:59:43.000000000 +0900
+++ jma-receipt/configure.in	2002-12-10 17:17:54.000000000 +0900
@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(cobol/orca00/ORCGM00.CBL)
 
+PACKAGE=jma-receipt
+AC_SUBST(PACKAGE)
+
 AC_PREFIX_DEFAULT(/usr/local/orca)
 
 dnl Checks for programs.
@@ -23,9 +26,15 @@
             [sitelibdir=$withval],
             [sitelibdir='${prefix}/lib'])
 
+AC_ARG_WITH(sitelibexecdir,
+	    [  --with-sitelibexecdir=DIR site executable files in DIR [PREFIX/lib]],
+            [sitelibexecdir=$withval],
+            [sitelibexecdir='${prefix}/lib'])
+
 AC_SUBST(sitedir)dnl
 AC_SUBST(sitesrcdir)dnl
 AC_SUBST(sitelibdir)dnl
+AC_SUBST(sitelibexecdir)dnl
 
 AC_MSG_CHECKING(OpenCOBOL compiler)
 AC_ARG_WITH(open-cobol-prefix,
@@ -143,5 +152,6 @@
 init/Makefile
 tools/Makefile
 Makefile
+Makefile.directories
 etc/jma-receipt.env
 ])
diff -urN jma-receipt.orig/data/Makefile.in jma-receipt/data/Makefile.in
--- jma-receipt.orig/data/Makefile.in	2002-11-11 22:55:00.000000000 +0900
+++ jma-receipt/data/Makefile.in	2002-12-10 16:49:08.000000000 +0900
@@ -1,10 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-ORCA_DIR = ${exec_prefix}
-datadir = ${ORCA_DIR}/data
 
 EXTRA_DIST = \
              SRYKBNNAME.TXT \
@@ -24,5 +23,5 @@
 	-rm -f Makefile
 
 install: all
-	$(INSTALL) -d $(datadir)
-	$(INSTALL_DATA) $(EXTRA_DIST) $(datadir)
+	$(INSTALL) -d $(orcadatadir)
+	$(INSTALL_DATA) $(EXTRA_DIST) $(orcadatadir)
diff -urN jma-receipt.orig/doc/Makefile.in jma-receipt/doc/Makefile.in
--- jma-receipt.orig/doc/Makefile.in	2002-11-11 22:55:00.000000000 +0900
+++ jma-receipt/doc/Makefile.in	2002-12-10 16:50:35.000000000 +0900
@@ -1,9 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-docdir = ${prefix}/doc
 
 EXTRA_DIST = \
         license.html \
diff -urN jma-receipt.orig/etc/jma-receipt.env.in jma-receipt/etc/jma-receipt.env.in
--- jma-receipt.orig/etc/jma-receipt.env.in	2002-12-04 14:56:12.000000000 +0900
+++ jma-receipt/etc/jma-receipt.env.in	2002-12-13 19:00:59.000000000 +0900
@@ -1,33 +1,40 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libdir=@libdir@
+libexecdir=@libexecdir@
+datadir=@datadir@
 
 SYSCONFDIR=@sysconfdir@
 
-ORCA_DIR=${exec_prefix}
-
-COPYDIR=${ORCA_DIR}/cobol/copy
-DATADIR=${ORCA_DIR}/data
-DOCDIR=${ORCA_DIR}/doc
-FORMDIR=${ORCA_DIR}/form
-INITDIR=${ORCA_DIR}/init
-LDDEFDIR=${ORCA_DIR}/lddef
-RECORDDIR=${ORCA_DIR}/record
-SCREENDIR=${ORCA_DIR}/screen
-SCRIPTSDIR=${ORCA_DIR}/scripts
-LIBDIR=@libdir@
+ORCA_LIBDIR=${libdir}/@PACKAGE@
+ORCA_LIBEXECDIR=${libexecdir}/@PACKAGE@
+ORCA_DATADIR=${datadir}/@PACKAGE@
+
+COPYDIR=${ORCA_DATADIR}/cobol/copy
+DATADIR=${ORCA_DATADIR}/data
+DOCDIR=${ORCA_DATADIR}/doc
+FORMDIR=${ORCA_DATADIR}/form
+INITDIR=${ORCA_LIBEXECDIR}/init
+LDDEFDIR=${ORCA_DATADIR}/lddef
+RECORDDIR=${ORCA_DATADIR}/record
+SCREENDIR=${ORCA_DATADIR}/screen
+SCRIPTSDIR=${ORCA_LIBEXECDIR}/scripts
+LIBDIR=${ORCA_LIBDIR}
 
 SITEDIR=@sitedir@
 SITESRCDIR=@sitesrcdir@
 SITELIBDIR=@sitelibdir@
+SITELIBEXECDIR=@sitelibexecdir@
 
 SITECOPYDIR=${SITEDIR}/cobol/copy
 SITEDATADIR=${SITEDIR}/data
+SITEDOCDIR=${SITEDIR}/doc
 SITEFORMDIR=${SITEDIR}/form
-SITEINITDIR=${SITEDIR}/init
+SITEINITDIR=${SITELIBEXECDIR}/init
 SITELDDEFDIR=${SITEDIR}/lddef
 SITERECORDDIR=${SITEDIR}/record
 SITESCREENDIR=${SITEDIR}/screen
-SITESCRIPTSDIR=${SITEDIR}/scripts
+SITESCRIPTSDIR=${SITELIBEXECDIR}/scripts
 
 DBSTUB=@DBSTUB@
 
diff -urN jma-receipt.orig/form/Makefile.in jma-receipt/form/Makefile.in
--- jma-receipt.orig/form/Makefile.in	2002-11-22 19:32:22.000000000 +0900
+++ jma-receipt/form/Makefile.in	2002-12-10 16:51:09.000000000 +0900
@@ -1,10 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-ORCA_DIR = ${exec_prefix}
-formdir = ${ORCA_DIR}/form
 
 EXTRA_DIST = \
               HC01.dia \
diff -urN jma-receipt.orig/init/Makefile.in jma-receipt/init/Makefile.in
--- jma-receipt.orig/init/Makefile.in	2002-12-05 16:10:05.000000000 +0900
+++ jma-receipt/init/Makefile.in	2002-12-10 16:51:29.000000000 +0900
@@ -1,15 +1,12 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-sysconfdir= @sysconfdir@
-ORCA_DIR = @exec_prefix@
-initdir = ${ORCA_DIR}/init
-
 EXTRA_DIST = \
              orca_dbkanri_orig.dump \
              orca_user.dump
diff -urN jma-receipt.orig/lddef/Makefile.in jma-receipt/lddef/Makefile.in
--- jma-receipt.orig/lddef/Makefile.in	2002-12-05 16:10:05.000000000 +0900
+++ jma-receipt/lddef/Makefile.in	2002-12-10 16:52:37.000000000 +0900
@@ -1,11 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-ORCA_DIR = ${exec_prefix}
-lddefdir = ${ORCA_DIR}/lddef
-libdir = @libdir@
 
 CPP = @CPP@
 # dummy flags
@@ -73,7 +71,7 @@
 filecheck:
 
 directory:
-	sed -e 's,\@ORCA_DIR\@,$(ORCA_DIR),g' \
+	sed -e 's,\@ORCA_DATADIR\@,$(ORCA_DATADIR),g' \
 	$(DIRECTORYFILE_in) > $(DIRECTORYFILE) 
 
 dbgroup.inc: 
diff -urN jma-receipt.orig/lddef/directory.in jma-receipt/lddef/directory.in
--- jma-receipt.orig/lddef/directory.in	2002-11-22 19:32:22.000000000 +0900
+++ jma-receipt/lddef/directory.in	2002-12-10 16:51:59.000000000 +0900
@@ -2,7 +2,7 @@
 
 #linksize	64512;
 
-base	"@ORCA_DIR@";
+base	"@ORCA_DATADIR@";
 
 lddir	"=/lddef:=/site-lib/lddef";
 bddir	"=/lddef:=/site-lib/lddef";
diff -urN jma-receipt.orig/record/Makefile.in jma-receipt/record/Makefile.in
--- jma-receipt.orig/record/Makefile.in	2002-11-12 21:09:52.000000000 +0900
+++ jma-receipt/record/Makefile.in	2002-12-10 16:53:01.000000000 +0900
@@ -1,9 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-recorddir = ${exec_prefix}/record
 
 install_ignore := Makefile.in Makefile build-stamp
 
diff -urN jma-receipt.orig/screen/Makefile.in jma-receipt/screen/Makefile.in
--- jma-receipt.orig/screen/Makefile.in	2002-12-03 10:38:12.000000000 +0900
+++ jma-receipt/screen/Makefile.in	2002-12-10 16:53:15.000000000 +0900
@@ -1,9 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-screendir = ${exec_prefix}/screen
 
 EXTRA_DIST = \
 	C02.glade \
diff -urN jma-receipt.orig/scripts/Makefile.in jma-receipt/scripts/Makefile.in
--- jma-receipt.orig/scripts/Makefile.in	2002-12-05 20:39:25.000000000 +0900
+++ jma-receipt/scripts/Makefile.in	2002-12-10 16:54:57.000000000 +0900
@@ -1,13 +1,11 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-sysconfdir= @sysconfdir@
-ORCA_DIR=${exec_prefix}
-scriptsdir = ${ORCA_DIR}/scripts
 
 noinst_shell_sources = \
 	sample.sh.in \
diff -urN jma-receipt.orig/scripts/allways/site-upgrade.sh.in jma-
receipt/scripts/allways/site-upgrade.sh.in
--- jma-receipt.orig/scripts/allways/site-upgrade.sh.in	2002-11-15 15:17:17.000000000 +0900
+++ jma-receipt/scripts/allways/site-upgrade.sh.in	2002-12-13 18:16:26.000000000 +0900
@@ -24,29 +24,93 @@
 
 # copy scripts file
 echo -n "Copying scripts files..."
-for d in scripts/daily  scripts/kaisei scripts/monthly  \
-	 scripts/kentan scripts/allways; do
-  if test -d "${SITESRCDIR}/${d}"; then
-    mkdir -p "${SITEDIR}/${d}"
-    for f in `ls ${SITESRCDIR}/${d}`; do 
+for d in daily  kaisei monthly  \
+	 kentan allways; do
+  if test -d "${SITESRCDIR}/scripts/${d}"; then
+    mkdir -p "${SITESCRIPTSDIR}/${d}"
+    for f in `ls ${SITESRCDIR}/scripts/${d}`; do 
       sed -e 's,\@jma-receipt-env\@,@jma-receipt-env@,g' \
-      < "${SITESRCDIR}/${d}/${f}" > "${SITEDIR}/${d}/${f}"
+      < "${SITESRCDIR}/scripts/${d}/${f}" > "${SITESCRIPTSDIR}/${d}/${f}"
     done
   fi
 done
 echo "done"
 
+# copy initializing script files
+echo -n "Copying initializing script files..."
+if test -d "${SITESRCDIR}/init"; then
+  mkdir -p "${SITEINITDIR}"
+  chown orca.orca "${SITEINITDIR}"
+  for f in `ls ${SITESRCDIR}/init`; do 
+    cp "${SITESRCDIR}/init/${f}" "${SITEINITDIR}"
+  done
+fi
+echo "done"
+
 # copy data files
 echo -n "Copying data files..."
-for d in data doc form init lddef record screen ; do
-  if test -d "${SITESRCDIR}/${d}"; then
-    mkdir -p "${SITEDIR}/${d}"
-    chown orca.orca "${SITEDIR}/${d}"
-    for f in `ls ${SITESRCDIR}/${d}`; do 
-      cp "${SITESRCDIR}/${d}/${f}" "${SITEDIR}/${d}"
-    done
-  fi
-done
+if test -d "${SITESRCDIR}/data"; then
+  mkdir -p "${SITEDATADIR}"
+  chown orca.orca "${SITEDATADIR}"
+  for f in `ls ${SITESRCDIR}/data`; do 
+    cp "${SITESRCDIR}/data/${f}" "${SITEDATADIR}"
+  done
+fi
+echo "done"
+
+# copy doc files
+echo -n "Copying doc files..."
+if test -d "${SITESRCDIR}/doc"; then
+  mkdir -p "${SITEDOCDIR}"
+  chown orca.orca "${SITEDOCDIR}"
+  for f in `ls ${SITESRCDIR}/doc`; do 
+    cp "${SITESRCDIR}/doc/${f}" "${SITEDOCDIR}"
+  done
+fi
+echo "done"
+
+# copy form files
+echo -n "Copying form files..."
+if test -d "${SITESRCDIR}/form"; then
+  mkdir -p "${SITEFORMDIR}"
+  chown orca.orca "${SITEFORMDIR}"
+  for f in `ls ${SITESRCDIR}/form`; do 
+    cp "${SITESRCDIR}/form/${f}" "${SITEFORMDIR}"
+  done
+fi
+echo "done"
+
+# copy lddef files
+echo -n "Copying lddef files..."
+if test -d "${SITESRCDIR}/lddef"; then
+  mkdir -p "${SITELDDEFDIR}"
+  chown orca.orca "${SITELDDEFDIR}"
+  for f in `ls ${SITESRCDIR}/lddef`; do 
+    cp "${SITESRCDIR}/lddef/${f}" "${SITELDDEFDIR}"
+  done
+fi
+echo "done"
+
+# copy record files
+echo -n "Copying record files..."
+if test -d "${SITESRCDIR}/record"; then
+  mkdir -p "${SITERECORDDIR}"
+  chown orca.orca "${SITERECORDDIR}"
+  for f in `ls ${SITESRCDIR}/record`; do 
+    cp "${SITESRCDIR}/record/${f}" "${SITERECORDDIR}"
+  done
+fi
+echo "done"
+
+# copy screen files
+echo -n "Copying screen files..."
+if test -d "${SITESRCDIR}/screen"; then
+  mkdir -p "${SITESCREENDIR}"
+  chown orca.orca "${SITESCREENDIR}"
+  for f in `ls ${SITESRCDIR}/screen`; do 
+    cp "${SITESRCDIR}/screen/${f}" "${SITESCREENDIR}"
+  done
+fi
 echo "done"
 
 #copy etc files
diff -urN jma-receipt.orig/scripts/claim/HL01.sh.in jma-receipt/scripts/claim/HL01.sh.in
--- jma-receipt.orig/scripts/claim/HL01.sh.in	2002-12-06 16:54:28.000000000 +0900
+++ jma-receipt/scripts/claim/HL01.sh.in	2002-12-10 17:10:10.000000000 +0900
@@ -9,7 +9,7 @@
 
 . $JMARECEIPT_ENV
 
-ORCASCRIPT=$ORCA_DIR/scripts/claim/rb
+ORCASCRIPT=$SCRIPTSDIR/claim/rb
 #-------------------------------------------#
 #        $1 KBN        X(01)
 #        $2 PTID       9(10)
diff -urN jma-receipt.orig/scripts/claim/HL02.sh.in jma-receipt/scripts/claim/HL02.sh.in
--- jma-receipt.orig/scripts/claim/HL02.sh.in	2002-12-06 16:54:28.000000000 +0900
+++ jma-receipt/scripts/claim/HL02.sh.in	2002-12-10 17:10:23.000000000 +0900
@@ -9,7 +9,7 @@
 
 . $JMARECEIPT_ENV
 
-ORCASCRIPT=$ORCA_DIR/scripts/claim/rb
+ORCASCRIPT=$SCRIPTSDIR/claim/rb
 #-------------------------------------------#
 #        $1 KBN        X(01)
 #        $2 PTID       9(10)
diff -urN jma-receipt.orig/scripts/claim/HL03.sh.in jma-receipt/scripts/claim/HL03.sh.in
--- jma-receipt.orig/scripts/claim/HL03.sh.in	2002-12-06 16:54:28.000000000 +0900
+++ jma-receipt/scripts/claim/HL03.sh.in	2002-12-10 17:10:33.000000000 +0900
@@ -9,7 +9,7 @@
 
 . $JMARECEIPT_ENV
 
-ORCASCRIPT=$ORCA_DIR/scripts/claim/rb
+ORCASCRIPT=$SCRIPTSDIR/claim/rb
 #-------------------------------------------#
 #  $1 - InputXMLFile
 #  $2 - Output SequencialFile
diff -urN jma-receipt.orig/scripts/claim/ORC_CLAIM_SERVER.sh.in jma-
receipt/scripts/claim/ORC_CLAIM_SERVER.sh.in
--- jma-receipt.orig/scripts/claim/ORC_CLAIM_SERVER.sh.in	2002-12-06 16:54:28.000000000 
+0900
+++ jma-receipt/scripts/claim/ORC_CLAIM_SERVER.sh.in	2002-12-10 17:05:18.000000000 +0900
@@ -13,7 +13,7 @@
 	  echo "argument miss match"
           exit 0
 	fi
-ORCASCRIPT=$ORCA_DIR/scripts/claim/rb
+ORCASCRIPT=$SCRIPTSDIR/claim/rb
 #   orca_CLAIM_SERVER 
   export COB_LIBRARY_PATH=.:/usr/lib/open-cobol:"$LIBDIR"
   cd $ORCASCRIPT
diff -urN jma-receipt.orig/tools/Makefile.in jma-receipt/tools/Makefile.in
--- jma-receipt.orig/tools/Makefile.in	2002-12-10 16:04:51.000000000 +0900
+++ jma-receipt/tools/Makefile.in	2002-12-10 16:56:59.000000000 +0900
@@ -1,9 +1,9 @@
+top_srcdir = @top_srcdir@
+include $(top_srcdir)/Makefile.directories
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-prefix = @prefix@
-exec_prefix= @exec_prefix@
-sysconfdir = @sysconfdir@
 
 EXTRA_DIST = monitor.sh
 

--  ________________________________
  _/_/  Tomohiro "Tomo-p" KATO
 _/_/  e-mail : tomop@xxxxxxxxxxxxx
_/_/  http://www.teamgedoh.net/
Follow-Ups:
- [orca-dev:00311] Re: FYI: patch for Makefiles
  - From: Noboru Saitou
Prev by Date: [orca-dev:00308] Re: MONPE-0.4.6 のリリース
Next by Date: [orca-dev:00310] RE: レセプト・カスタム化プログラムに影響する不具合への対応
Previous by thread: [orca-dev:00306] Re: [monpe 4.6] 要望
Next by thread: [orca-dev:00311] Re: FYI: patch for Makefiles
Index(es):
- Date
- Thread