- moved manuals to man/ subdir

svn-id: @5476

diff --git a/Makefile.am b/Makefile.am
index ad85cbf2907b094791173efe82c84ccdaf1f6497..7aa0a0a655189028c5ae14afe0a3838f8213944d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #      $Id$
 #
 
-SUBDIRS = src ppp isapnp sysconfig rc.d doc po
+SUBDIRS = src ppp isapnp sysconfig rc.d doc man po
 
 sysconf_DATA = \
        adjtime \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b1bfc228dfdf628b0c168e5c5978b17dcea6a24a..b645eb31dce847d14c27076d37c7cf8ab2047618 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,20 +2,9 @@
 
 docdir = @docdir@
 
-man_MANS = \
-       consoletype.1 \
-       doexec.1 \
-       genhostid.1 \
-       initlog.1 \
-       ipcalc.1 \
-       netreport.1 \
-       ppp-watch.8 \
-       usernetctl.8 \
-       usleep.1
-       
 doc_DATA = \
        net-scripts.txt \
        sysconfig.txt \
        sysvinitfiles
 
-EXTRA_DIST = $(man_MANS) $(doc_DATA)
+EXTRA_DIST = $(doc_DATA)

diff --git a/man/Makefile.am b/man/Makefile.am
index 03c2499ae6f25670c13891d52c917eaa97bdc9a4..55bb3cfed803c9762e80f063ba318972328fb0ad 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,15 @@
 @SET_MAKE@
 
 man_MANS = \
+       consoletype.1 \
+       doexec.1 \
+       genhostid.1 \
+       initlog.1 \
+       ipcalc.1 \
+       netreport.1 \
+       ppp-watch.8 \
+       usernetctl.8 \
+       usleep.1 \
        start-stop-daemon.8
 
 # will overwrite rather putting to subdirs. blah

diff --git a/doc/consoletype.1 b/man/consoletype.1
similarity index 100%
rename from doc/consoletype.1
rename to man/consoletype.1

diff --git a/doc/doexec.1 b/man/doexec.1
similarity index 100%
rename from doc/doexec.1
rename to man/doexec.1

diff --git a/doc/genhostid.1 b/man/genhostid.1
similarity index 100%
rename from doc/genhostid.1
rename to man/genhostid.1

diff --git a/doc/initlog.1 b/man/initlog.1
similarity index 100%
rename from doc/initlog.1
rename to man/initlog.1

diff --git a/doc/ipcalc.1 b/man/ipcalc.1
similarity index 100%
rename from doc/ipcalc.1
rename to man/ipcalc.1

diff --git a/doc/netreport.1 b/man/netreport.1
similarity index 100%
rename from doc/netreport.1
rename to man/netreport.1

diff --git a/doc/ppp-watch.8 b/man/ppp-watch.8
similarity index 100%
rename from doc/ppp-watch.8
rename to man/ppp-watch.8

diff --git a/doc/usernetctl.8 b/man/usernetctl.8
similarity index 100%
rename from doc/usernetctl.8
rename to man/usernetctl.8

diff --git a/doc/usleep.1 b/man/usleep.1
similarity index 100%
rename from doc/usleep.1
rename to man/usleep.1