[Rt-commit] [svn] r1663 - in rt/branches/3.3-TESTING: . m4

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue Oct 19 01:23:26 2004
New Revision: 1663

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/config.layout
   rt/branches/3.3-TESTING/m4/rt_layout.m4
Log:
 r6048 at tinbook:  jesse | 2004-10-19T05:24:15.256721Z
 RT-Ticket: 6198
 RT-Status: resolved
 RT-Update: correspond
 
 Applied a patch to add an fhs-compliant RT layout and fix some of the layout parsing.
 


Modified: rt/branches/3.3-TESTING/config.layout
==============================================================================
--- rt/branches/3.3-TESTING/config.layout	(original)
+++ rt/branches/3.3-TESTING/config.layout	Tue Oct 19 01:23:26 2004
@@ -59,6 +59,56 @@
   customlibdir:		${customdir}/lib
 </Layout>
 
+<Layout FHS>
+  prefix:		/usr/local
+  exec_prefix:		${prefix}
+  bindir:		${prefix}/bin
+  sbindir:		${prefix}/sbin
+  sysconfdir:		/etc+
+  datadir:		${prefix}/share
+# FIXME: missing support for lib64
+  libdir:		${prefix}/lib
+  mandir:		${datadir}/man
+# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	/var
+  logfiledir:		${localstatedir}/log
+# XXX: "/var/cache/mason/*"?
+  masonstatedir:	${localstatedir}/cache/mason_data
+  sessionstatedir:	${localstatedir}/cache/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
+<Layout FHS>
+  prefix:		/usr/local
+  exec_prefix:		${prefix}
+  bindir:		${prefix}/bin
+  sbindir:		${prefix}/sbin
+  sysconfdir:		/etc+
+  datadir:		${prefix}/share
+# FIXME: missing support for lib64
+  libdir:		${prefix}/lib
+  mandir:		${datadir}/man
+# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
+  htmldir:		${datadir}/html
+  manualdir:		${datadir}/doc
+  localstatedir:	/var
+  logfiledir:		${localstatedir}/log
+# XXX: "/var/cache/mason/*"?
+  masonstatedir:	${localstatedir}/cache/mason_data
+  sessionstatedir:	${localstatedir}/cache/session_data
+  customdir:		${prefix}/local
+  custometcdir:		${customdir}/etc
+  customhtmldir:	${customdir}/html
+  customlexdir:		${customdir}/po
+  customlibdir:		${customdir}/lib
+</Layout>
+
 <Layout FreeBSD>
   prefix:		/usr/local
   exec_prefix:		${prefix}

Modified: rt/branches/3.3-TESTING/m4/rt_layout.m4
==============================================================================
--- rt/branches/3.3-TESTING/m4/rt_layout.m4	(original)
+++ rt/branches/3.3-TESTING/m4/rt_layout.m4	Tue Oct 19 01:23:26 2004
@@ -21,14 +21,15 @@
 		pldconf=./config.pld
 		$PERL  -0777 -p -e "\$layout = '$2';"  -e '
 		s/.*<Layout\s+$layout>//gims; 
-		s/\<\/Layout\>.*//s; 
-		s/^#.*$//m;
+		s/<\/Layout>.*//s; 
+		s/^#.*$//gm;
 		s/^\s+//gim;
 		s/\s+$/\n/gim;
 		s/\+$/\/rt3/gim;
 		# m4 will not let us just use $1, we need @S|@1
-		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
-		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
+#		s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+		# uh, should be [:=], but m4 apparently substitutes something...
+		s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
 		 ' < $1 > $pldconf
 
 		if test -s $pldconf; then