6 files changed, 80 insertions, 5 deletions
diff --git a/utils/rquotad/Makefile.am b/utils/rquotad/Makefile.am
new file mode 100644
index 0000000..b478fad
--- /dev/null
+++ b/utils/rquotad/Makefile.am
@@ -0,0 +1,61 @@
+## Process this file with automake to produce Makefile.in
+
+man8_MANS	= rquotad.man
+
+RPCPREFIX	= rpc.
+KPREFIX		= @kprefix@
+sbin_PROGRAMS	= rquotad
+
+EXTRA_DIST = rquota.x $(man8_MANS) NEW README.okir
+
+rquotad_SOURCES = rquota_server.c rquota_svc.c rquota_xdr.c quotactl.c \
+		  hasquota.c mntent.h pathnames.h rquota.h
+rquotad_LDADD = ../../support/export/libexport.a \
+		../../support/nfs/libnfs.a \
+		../../support/misc/libmisc.a \
+		$(LIBBSD) $(LIBWRAP) $(LIBNSL)
+rquotad_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) \
+                   -I$(top_srcdir)/support/export
+
+MAINTAINERCLEANFILES = Makefile.in
+
+#######################################################################
+# The following allows the current practice of having
+# daemons renamed during the install to include RPCPREFIX
+# and the KPREFIX
+# This could all be done much easier with program_transform_name
+# ( program_transform_name = s/^/$(RPCPREFIX)$(KPREFIX)/ )
+# but that also renames the man pages, which the current
+# practice does not do.
+install-exec-hook:
+	(cd $(DESTDIR)$(sbindir) && \
+	  for p in $(sbin_PROGRAMS); do \
+	    mv -f $$p$(EXEEXT) $(RPCPREFIX)$(KPREFIX)$$p$(EXEEXT) ;\
+	  done)
+uninstall-hook:
+	(cd $(DESTDIR)$(sbindir) && \
+	  for p in $(sbin_PROGRAMS); do \
+	    rm -f $(RPCPREFIX)$(KPREFIX)$$p$(EXEEXT) ;\
+	  done)
+
+
+# XXX This makes some assumptions about what automake does.
+# XXX But there is no install-man-hook or install-man-local.
+install-man: install-man8 install-man-links
+uninstall-man: uninstall-man8 uninstall-man-links
+
+install-man-links:
+	(cd $(DESTDIR)$(man8dir) && \
+	  for m in $(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS); do \
+	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
+	    rm -f $(RPCPREFIX)$$inst ; \
+	    $(LN_S) $$inst $(RPCPREFIX)$$inst ; \
+	  done)
+
+uninstall-man-links:
+	(cd $(DESTDIR)$(man8dir) && \
+	  for m in $(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS); do \
+	    inst=`echo $$m | sed -e 's/man$$/8/'`; \
+	    rm -f $(RPCPREFIX)$$inst ; \
+	  done)
+
diff --git a/utils/rquotad/hasquota.c b/utils/rquotad/hasquota.c
index f93e90a..d2d8115 100644
--- a/utils/rquotad/hasquota.c
+++ b/utils/rquotad/hasquota.c
@@ -19,7 +19,10 @@
  *          as published by the Free Software Foundation; either version
  *          2 of the License, or (at your option) any later version.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define _LINUX_QUOTA_VERSION 1
 
 #include <sys/types.h>
diff --git a/utils/rquotad/quotactl.c b/utils/rquotad/quotactl.c
index 30e68a4..8966335 100644
--- a/utils/rquotad/quotactl.c
+++ b/utils/rquotad/quotactl.c
@@ -18,7 +18,10 @@
  *          as published by the Free Software Foundation; either version
  *          2 of the License, or (at your option) any later version.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/utils/rquotad/rquota_server.c b/utils/rquotad/rquota_server.c
index 45f351f..32e5cba 100644
--- a/utils/rquotad/rquota_server.c
+++ b/utils/rquotad/rquota_server.c
@@ -18,7 +18,10 @@
  *          as published by the Free Software Foundation; either version
  *          2 of the License, or (at your option) any later version.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define _LINUX_QUOTA_VERSION 1
 
 #include <rpc/rpc.h>
diff --git a/utils/rquotad/rquota_svc.c b/utils/rquotad/rquota_svc.c
index 1d07c1c..0785551 100644
--- a/utils/rquotad/rquota_svc.c
+++ b/utils/rquotad/rquota_svc.c
@@ -18,7 +18,10 @@
  *          as published by the Free Software Foundation; either version
  *          2 of the License, or (at your option) any later version.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef HAVE_TCP_WRAPPER
 #include "tcpwrapper.h"
diff --git a/utils/rquotad/rquota_xdr.c b/utils/rquotad/rquota_xdr.c
index 6e68bd4..46eb1e1 100644
--- a/utils/rquotad/rquota_xdr.c
+++ b/utils/rquotad/rquota_xdr.c
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <rpc/rpc.h>
 #include "rquota.h"