Log Message:
-----------
Change DOCDIR to docdir, which apparently is a macro used by RPM.

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.31 -> r1.32)
        configure.ac (r1.53 -> r1.54)
    slony1-engine/config:
        docs.m4 (r1.11 -> r1.12)
    slony1-engine/doc/adminguide:
        Makefile (r1.16 -> r1.17)
    slony1-engine/doc/concept:
        Makefile (r1.11 -> r1.12)
    slony1-engine/doc/howto:
        Makefile (r1.8 -> r1.9)
    slony1-engine/doc/implementation:
        Makefile (r1.10 -> r1.11)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/howto/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -Ldoc/howto/Makefile -Ldoc/howto/Makefile -u -w -r1.8 -r1.9
--- doc/howto/Makefile
+++ doc/howto/Makefile
@@ -21,13 +21,13 @@
 all:
 
 installdirs:
-ifdef DOCDIR
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/howto
+ifdef docdir
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/howto
 endif
 
 install: all installdirs
-ifdef DOCDIR
+ifdef docdir
 	for file in $(wildcard *.txt) $(wildcard *.html ); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/howto ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/howto ; \
 	done
 endif
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.31 -r1.32
--- Makefile.global.in
+++ Makefile.global.in
@@ -66,7 +66,7 @@
 DOCBOOKSTYLE=		@DOCBOOKSTYLE@
 COLLATEINDEX=		@COLLATEINDEX@
 PGAUTODOC=		@PGAUTODOC@
-DOCDIR=			@DOCDIR@
+docdir=			@docdir@
 
 # support programs
 PERL=			@PERL@
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.53 -r1.54
--- configure.ac
+++ configure.ac
@@ -202,7 +202,7 @@
 	SLON_AC_PATH_DOCBOOK_STYLESHEETS
 	SLON_AC_PATH_COLLATEINDEX
 	AC_SUBST(SGMLSPL, $SGMLSPL)
-	AC_SUBST(DOCDIR, $DOCDIR)
+	AC_SUBST(docdir, $docdir)
 else
   AC_MSG_RESULT(no)
 fi
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.11 -r1.12
--- config/docs.m4
+++ config/docs.m4
@@ -39,7 +39,7 @@
     fi
   fi
   if test x"${LOCATION}" != x; then
-   DOCDIR="${LOCATION}"
+   docdir="${LOCATION}"
   fi
   AC_LANG_RESTORE
 ]) dnl ACX_SLONYDOCS
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.16 -r1.17
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -61,26 +61,26 @@
 all: html man
 
 installdirs:
-ifdef DOCDIR
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/sgml
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/html
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/man1
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/man$(DEFAULTSECTION)
+ifdef docdir
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/sgml
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/man1
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/man$(DEFAULTSECTION)
 endif
 
 install: installdirs
-ifdef DOCDIR
+ifdef docdir
 	for file in $(wildcard $(srcdir)/*.sgml) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/sgml; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/sgml; \
 	done
 	for file in $(wildcard man1/*) ; do \
-	   $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/man1 ;\
+	   $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/man1 ;\
 	done
 	for file in $(wildcard man$(DEFAULTSECTION)/*) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/man$(DEFAULTSECTION) ;\
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/man$(DEFAULTSECTION) ;\
 	done
 	for file in $(wildcard *.html) stylesheet.css ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/html ;\
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/html ;\
 	done
 endif
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/concept/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ldoc/concept/Makefile -Ldoc/concept/Makefile -u -w -r1.11 -r1.12
--- doc/concept/Makefile
+++ doc/concept/Makefile
@@ -43,14 +43,14 @@
 all-txt:	Slon.eps $(TXT)
 
 installdirs:
-ifdef DOCDIR
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/concept
+ifdef docdir
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/concept
 endif
 
 install: installdirs all
-ifdef DOCDIR
+ifdef docdir
 	for file in $(PS) $(PDF) $(TXT) Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/concept ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/concept ; \
 	done
 endif
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/implementation/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -Ldoc/implementation/Makefile -Ldoc/implementation/Makefile -u -w -r1.10 -r1.11
--- doc/implementation/Makefile
+++ doc/implementation/Makefile
@@ -41,14 +41,14 @@
 all-txt:	Slon.eps $(TXT)
 
 installdirs:
-ifdef DOCDIR
-	$(mkinstalldirs) $(DESTDIR)$(DOCDIR)/implementation
+ifdef docdir
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/implementation
 endif
 
 install: all installdirs
-ifdef DOCDIR
+ifdef docdir
 	for file in $(PS) $(PDF) $(TXT) Slon.eps Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(DOCDIR)/implementation ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/implementation ; \
 	done
 endif