[patch] Patch to allow GNU standard install

gnu-install.patch (text/plain), 4.28 KB, created by Christopher Hogan on 2006-06-27 13:31:36 UTC

diff -ur old/webcit/Makefile.in new/webcit/Makefile.in
--- old/webcit/Makefile.in	2006-06-01 21:24:17.000000000 -0600
+++ new/webcit/Makefile.in	2006-06-27 20:52:37.000000000 -0600
@@ -13,6 +13,11 @@
 PTHREAD_DEFS=@PTHREAD_DEFS@
 srcdir=@srcdir@
 prefix=@prefix@
+exec_prefix=@exec_prefix@
+sbindir=@sbindir@
+datadir=@datadir@
+pkgdatadir=@pkgdatadir@
+localedir=@localedir@
 top_builddir=`pwd`
 
 LIB_SUBDIRS=
@@ -65,10 +70,10 @@
 	$(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" $<
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\"  $<
+	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\"  $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
@@ -81,24 +86,32 @@
 
 install:
 	test -d $(root)$(prefix) || mkdir $(root)$(prefix)
-	test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
+	test -d $(root)$(datadir) || mkdir $(root)$(datadir)
+	test -d $(root)$(pkgdatadir) || mkdir $(root)$(pkgdatadir)
+	test -d $(root)$(pkgdatadir)/static || mkdir $(root)$(pkgdatadir)/static
 	for i in `find tiny_mce -type d | grep -v .svn` \
 		; do \
-		test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
-	done
-	for i in `find locale -type d | grep -v .svn` \
-		; do \
-		test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
+		test -d $(root)$(pkgdatadir)/$$i || mkdir $(root)$(pkgdatadir)/$$i; \
 	done
 	for i in \
-		webserver \
-		setup \
 		`find static -type f | grep -v .svn` \
 		`find tiny_mce -type f | grep -v .svn` \
-		`find locale -type f | grep -v .svn` \
 		; do \
-		$(INSTALL) $$i $(root)$(prefix)/$$i; \
+		$(INSTALL) $$i $(root)$(pkgdatadir)/$$i; \
+	done
+	test -d $(root)$(localedir) || mkdir $(root)$(localedir)
+	for i in `find locale -type d | grep -v .svn | $(SED) 's/locale//'` \
+		; do \
+		test -d $(root)$(localedir)$$i || mkdir $(root)$(localedir)$$i; \
+	done
+	for i in \
+		`find locale -type f | grep -v .svn | $(SED) 's/locale//'` \
+		; do \
+		$(INSTALL) locale$$i $(root)$(localedir)$$i; \
 	done
+	test -d $(root)$(sbindir) || mkdir $(root)$(sbindir)
+	$(INSTALL) webserver $(root)$(sbindir)
+	$(INSTALL) setup $(root)$(sbindir)
 
 TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
   mostlyclean-recursive realclean-recursive:
diff -ur old/webcit/configure.in new/webcit/configure.in
--- old/webcit/configure.in	2006-06-01 21:24:17.000000000 -0600
+++ new/webcit/configure.in	2006-06-27 00:00:01.000000000 -0600
@@ -1,10 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id: configure.in 4305 2006-02-12 05:10:31Z ajc $
-AC_INIT(webserver.c)
+AC_INIT(webcit, 6.82)
+AC_CONFIG_SRCDIR(webserver.c)
 
-
-PACKAGE=webcit
-VERSION=6.72
+#Not sure this is needed. I'll leave just in case.
+PACKAGE=AC_PACKAGE_NAME
+VERSION=AC_PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -15,7 +16,22 @@
 AC_PROG_INSTALL
 AC_CHECK_PROG(AUTOCONF, autoconf)
 AC_CHECK_PROG(SED, sed, sed, no)
-AC_PREFIX_DEFAULT(/usr/local/webcit)
+
+#Set paths. A With switch is used to allow the option of a GNU standards based install.
+#This leaves the all-in-one directory install as default.
+AC_ARG_WITH(gnustd, [  --with-gnustd          use GNU standard for install])
+if test "$with_gnustd" = "yes"; then
+	pkgdatadir='${datadir}/AC_PACKAGE_NAME'
+	AC_SUBST(pkgdatadir)
+	localedir='${datadir}/locale'
+	AC_SUBST(localedir)
+else
+	pkgdatadir='${prefix}/AC_PACKAGE_NAME'
+	AC_SUBST(pkgdatadir)
+	sbindir='${pkgdatadir}'
+	localedir='${pkgdatadir}/locale'
+	AC_SUBST(localedir)
+fi
 
 AC_ARG_WITH(with_libical, [  --with-libical          use libical calendaring library])
 AC_ARG_WITH(with_zlib,    [  --with-zlib             use zlib compression if present])
@@ -355,7 +371,8 @@
 
 AC_SUBST(SETUP_LIBS)
 
-AC_OUTPUT(Makefile po/Makefile )
+AC_CONFIG_FILES(Makefile po/Makefile)
+AC_OUTPUT
 
 echo ------------------------------------------------------------------------
 echo 'zlib compression:                ' $ok_zlib