Merge pull request #1 from mathieuolivari/852d7c4fd19fc5588d5aad919ff…

…eb43ad2a5d690 Various fixes for package debianization
qca · May 7, 2013 · e4a21ca · e4a21ca
2 parents a95f97e + 852d7c4
commit e4a21ca
Show file tree

Hide file tree

Showing 235 changed files with 171 additions and 173 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 *.[0-9][0-9][0-9]
 *.htm
-*.html
 *.log
 *.o
 *.pib

diff --git a/VisualStudioNET/Makefile b/VisualStudioNET/Makefile
@@ -24,7 +24,7 @@ all compile: ${TOOLS}
 library:
 #	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
 scripts manuals:
-install: compile library
+install: $(TOOLS) library
 #	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 #	cd ${BIN}; rm -f ${TOOLS}

diff --git a/docbook/CMEncrypt.7.html → docbook/CMEncrypt.1.html b/docbook/CMEncrypt.7.html → docbook/CMEncrypt.1.html
diff --git a/docbook/Makefile b/docbook/Makefile
@@ -17,7 +17,7 @@ XFLAGS=--skip-validation
 # symbols;
 # --------------------------------------------------------------------
 
-TRASH=*~ *.[0-9][0-9][0-9] t t.* *.7 *.7a *.1.html *.c.html *.cpp.html *.h.html *.hpp.html *.7.html *.7a.html *.sh.html *.xml.html *.xsd.html ch[0-9][0-9]*.html 
+TRASH=*~ *.[0-9][0-9][0-9] t t.* *.1 *.1a *.1.html *.c.html *.cpp.html *.h.html *.hpp.html *.1.html *.1a.html *.sh.html *.xml.html *.xsd.html ch[0-9][0-9]*.html 
 STYLES=param.xsl lists.xsl synop.xsl
 BOOKS=index.html 
 
@@ -33,10 +33,10 @@ manuals:
 scripts:
 library:
 	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${LIBRARY}
-install: compile library
+install: $(TOOLS) library
 	if [ -d ${LIBRARY} ]; then install -m ${WWW_PERM} -o ${OWNER} -g ${GROUP} *.html *.css *.png ${LIBRARY}; fi
 uninstall:
-	rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.7.html
+	rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.1.html
 setup:
 	install ${STYLES} ${DOCBOOK}
 clean:

diff --git a/docbook/ampID.7.html → docbook/ampID.1.html b/docbook/ampID.7.html → docbook/ampID.1.html
diff --git a/docbook/ampboot.7.html → docbook/ampboot.1.html b/docbook/ampboot.7.html → docbook/ampboot.1.html
diff --git a/docbook/amphost.7.html → docbook/amphost.1.html b/docbook/amphost.7.html → docbook/amphost.1.html
diff --git a/docbook/amplist.7.html → docbook/amplist.1.html b/docbook/amplist.7.html → docbook/amplist.1.html
diff --git a/docbook/amprate.7.html → docbook/amprate.1.html b/docbook/amprate.7.html → docbook/amprate.1.html
diff --git a/docbook/ampstat.7.html → docbook/ampstat.1.html b/docbook/ampstat.7.html → docbook/ampstat.1.html
diff --git a/docbook/amptest.7.html → docbook/amptest.1.html b/docbook/amptest.7.html → docbook/amptest.1.html
diff --git a/docbook/amptone.7.html → docbook/amptone.1.html b/docbook/amptone.7.html → docbook/amptone.1.html
diff --git a/docbook/amptool.7.html → docbook/amptool.1.html b/docbook/amptool.7.html → docbook/amptool.1.html
diff --git a/docbook/ampwait.7.html → docbook/ampwait.1.html b/docbook/ampwait.7.html → docbook/ampwait.1.html
diff --git a/docbook/chknvm.7.html → docbook/chknvm.1.html b/docbook/chknvm.7.html → docbook/chknvm.1.html
diff --git a/docbook/chknvm2.7.html → docbook/chknvm2.1.html b/docbook/chknvm2.7.html → docbook/chknvm2.1.html
diff --git a/docbook/chkpib.7.html → docbook/chkpib.1.html b/docbook/chkpib.7.html → docbook/chkpib.1.html
diff --git a/docbook/chkpib2.7.html → docbook/chkpib2.1.html b/docbook/chkpib2.7.html → docbook/chkpib2.1.html
diff --git a/docbook/config2cfg.7.html → docbook/config2cfg.1.html b/docbook/config2cfg.7.html → docbook/config2cfg.1.html
diff --git a/docbook/coqos_add.7.html → docbook/coqos_add.1.html b/docbook/coqos_add.7.html → docbook/coqos_add.1.html
diff --git a/docbook/coqos_info.7.html → docbook/coqos_info.1.html b/docbook/coqos_info.7.html → docbook/coqos_info.1.html
diff --git a/docbook/coqos_man.7.html → docbook/coqos_man.1.html b/docbook/coqos_man.7.html → docbook/coqos_man.1.html
diff --git a/docbook/coqos_mod.7.html → docbook/coqos_mod.1.html b/docbook/coqos_mod.7.html → docbook/coqos_mod.1.html
diff --git a/docbook/coqos_rel.7.html → docbook/coqos_rel.1.html b/docbook/coqos_rel.7.html → docbook/coqos_rel.1.html
diff --git a/docbook/edru.7.html → docbook/edru.1.html b/docbook/edru.7.html → docbook/edru.1.html
diff --git a/docbook/edsu.7.html → docbook/edsu.1.html b/docbook/edsu.7.html → docbook/edsu.1.html
diff --git a/docbook/efbu.7.html → docbook/efbu.1.html b/docbook/efbu.7.html → docbook/efbu.1.html
diff --git a/docbook/efeu.7.html → docbook/efeu.1.html b/docbook/efeu.7.html → docbook/efeu.1.html
diff --git a/docbook/efru.7.html → docbook/efru.1.html b/docbook/efru.7.html → docbook/efru.1.html
diff --git a/docbook/efsu.7.html → docbook/efsu.1.html b/docbook/efsu.7.html → docbook/efsu.1.html
diff --git a/docbook/getpib.7.html → docbook/getpib.1.html b/docbook/getpib.7.html → docbook/getpib.1.html
diff --git a/docbook/hpav.7.html → docbook/hpav.1.html b/docbook/hpav.7.html → docbook/hpav.1.html
diff --git a/docbook/hpavkey.7.html → docbook/hpavkey.1.html b/docbook/hpavkey.7.html → docbook/hpavkey.1.html
diff --git a/docbook/hpavkeys.7.html → docbook/hpavkeys.1.html b/docbook/hpavkeys.7.html → docbook/hpavkeys.1.html
diff --git a/docbook/int64host.7.html → docbook/int64host.1.html b/docbook/int64host.7.html → docbook/int64host.1.html
diff --git a/docbook/int6k.7.html → docbook/int6k.1.html b/docbook/int6k.7.html → docbook/int6k.1.html
diff --git a/docbook/int6kbaud.7.html → docbook/int6kbaud.1.html b/docbook/int6kbaud.7.html → docbook/int6kbaud.1.html
diff --git a/docbook/int6kboot.7.html → docbook/int6kboot.1.html b/docbook/int6kboot.7.html → docbook/int6kboot.1.html
diff --git a/docbook/int6kdetect.7.html → docbook/int6kdetect.1.html b/docbook/int6kdetect.7.html → docbook/int6kdetect.1.html
diff --git a/docbook/int6keth.7.html → docbook/int6keth.1.html b/docbook/int6keth.7.html → docbook/int6keth.1.html
diff --git a/docbook/int6kf.7.html → docbook/int6kf.1.html b/docbook/int6kf.7.html → docbook/int6kf.1.html
diff --git a/docbook/int6khost.7.html → docbook/int6khost.1.html b/docbook/int6khost.7.html → docbook/int6khost.1.html
diff --git a/docbook/int6kid.7.html → docbook/int6kid.1.html b/docbook/int6kid.7.html → docbook/int6kid.1.html
diff --git a/docbook/int6klist.7.html → docbook/int6klist.1.html b/docbook/int6klist.7.html → docbook/int6klist.1.html
diff --git a/docbook/int6klog.7.html → docbook/int6klog.1.html b/docbook/int6klog.7.html → docbook/int6klog.1.html
diff --git a/docbook/int6kmdio.7.html → docbook/int6kmdio.1.html b/docbook/int6kmdio.7.html → docbook/int6kmdio.1.html
diff --git a/docbook/int6kmdio2.7.html → docbook/int6kmdio2.1.html b/docbook/int6kmdio2.7.html → docbook/int6kmdio2.1.html
diff --git a/docbook/int6kmod.7.html → docbook/int6kmod.1.html b/docbook/int6kmod.7.html → docbook/int6kmod.1.html
diff --git a/docbook/int6krate.7.html → docbook/int6krate.1.html b/docbook/int6krate.7.html → docbook/int6krate.1.html
diff --git a/docbook/int6krule.7.html → docbook/int6krule.1.html b/docbook/int6krule.7.html → docbook/int6krule.1.html
diff --git a/docbook/int6kstat.7.html → docbook/int6kstat.1.html b/docbook/int6kstat.7.html → docbook/int6kstat.1.html
diff --git a/docbook/int6ktest.7.html → docbook/int6ktest.1.html b/docbook/int6ktest.7.html → docbook/int6ktest.1.html
diff --git a/docbook/int6ktone.7.html → docbook/int6ktone.1.html b/docbook/int6ktone.7.html → docbook/int6ktone.1.html
diff --git a/docbook/int6kuart.7.html → docbook/int6kuart.1.html b/docbook/int6kuart.7.html → docbook/int6kuart.1.html
diff --git a/docbook/int6kwait.7.html → docbook/int6kwait.1.html b/docbook/int6kwait.7.html → docbook/int6kwait.1.html
diff --git a/docbook/mac2pw.7.html → docbook/mac2pw.1.html b/docbook/mac2pw.7.html → docbook/mac2pw.1.html
diff --git a/docbook/mac2pwd.7.html → docbook/mac2pwd.1.html b/docbook/mac2pwd.7.html → docbook/mac2pwd.1.html
diff --git a/docbook/mdioblock.7.html → docbook/mdioblock.1.html b/docbook/mdioblock.7.html → docbook/mdioblock.1.html
diff --git a/docbook/mdioblock2.7.html → docbook/mdioblock2.1.html b/docbook/mdioblock2.7.html → docbook/mdioblock2.1.html
diff --git a/docbook/mdiodump.7.html → docbook/mdiodump.1.html b/docbook/mdiodump.7.html → docbook/mdiodump.1.html
diff --git a/docbook/mdustats.7.html → docbook/mdustats.1.html b/docbook/mdustats.7.html → docbook/mdustats.1.html
diff --git a/docbook/mme.7.html → docbook/mme.1.html b/docbook/mme.7.html → docbook/mme.1.html
diff --git a/docbook/modpib.7.html → docbook/modpib.1.html b/docbook/modpib.7.html → docbook/modpib.1.html
diff --git a/docbook/nics.7.html → docbook/nics.1.html b/docbook/nics.7.html → docbook/nics.1.html
diff --git a/docbook/nvmmerge.7.html → docbook/nvmmerge.1.html b/docbook/nvmmerge.7.html → docbook/nvmmerge.1.html
diff --git a/docbook/nvmsplit.7.html → docbook/nvmsplit.1.html b/docbook/nvmsplit.7.html → docbook/nvmsplit.1.html
diff --git a/docbook/pcapdevs.7.html → docbook/pcapdevs.1.html b/docbook/pcapdevs.7.html → docbook/pcapdevs.1.html
diff --git a/docbook/pib2xml.7.html → docbook/pib2xml.1.html b/docbook/pib2xml.7.html → docbook/pib2xml.1.html
diff --git a/docbook/pibcomp.7.html → docbook/pibcomp.1.html b/docbook/pibcomp.7.html → docbook/pibcomp.1.html
diff --git a/docbook/pibdump.7.html → docbook/pibdump.1.html b/docbook/pibdump.7.html → docbook/pibdump.1.html
diff --git a/docbook/pibruin.7.html → docbook/pibruin.1.html b/docbook/pibruin.7.html → docbook/pibruin.1.html
diff --git a/docbook/pibrump.7.html → docbook/pibrump.1.html b/docbook/pibrump.7.html → docbook/pibrump.1.html
diff --git a/docbook/plc.7.html → docbook/plc.1.html b/docbook/plc.7.html → docbook/plc.1.html
diff --git a/docbook/plcID.7.html → docbook/plcID.1.html b/docbook/plcID.7.html → docbook/plcID.1.html
diff --git a/docbook/plcboot.7.html → docbook/plcboot.1.html b/docbook/plcboot.7.html → docbook/plcboot.1.html
diff --git a/docbook/plcdevs.7.html → docbook/plcdevs.1.html b/docbook/plcdevs.7.html → docbook/plcdevs.1.html
diff --git a/docbook/plcfwd.7.html → docbook/plcfwd.1.html b/docbook/plcfwd.7.html → docbook/plcfwd.1.html
diff --git a/docbook/plcget.7.html → docbook/plcget.1.html b/docbook/plcget.7.html → docbook/plcget.1.html
diff --git a/docbook/plchost.7.html → docbook/plchost.1.html b/docbook/plchost.7.html → docbook/plchost.1.html
diff --git a/docbook/plchostd.7.html → docbook/plchostd.1.html b/docbook/plchostd.7.html → docbook/plchostd.1.html
diff --git a/docbook/plclist.7.html → docbook/plclist.1.html b/docbook/plclist.7.html → docbook/plclist.1.html
diff --git a/docbook/plclog.7.html → docbook/plclog.1.html b/docbook/plclog.7.html → docbook/plclog.1.html
diff --git a/docbook/plcmdio16.7.html → docbook/plcmdio16.1.html b/docbook/plcmdio16.7.html → docbook/plcmdio16.1.html
diff --git a/docbook/plcmdio32.7.html → docbook/plcmdio32.1.html b/docbook/plcmdio32.7.html → docbook/plcmdio32.1.html
diff --git a/docbook/plcotst.7.html → docbook/plcotst.1.html b/docbook/plcotst.7.html → docbook/plcotst.1.html
diff --git a/docbook/plcrate.7.html → docbook/plcrate.1.html b/docbook/plcrate.7.html → docbook/plcrate.1.html
diff --git a/docbook/plcrule.7.html → docbook/plcrule.1.html b/docbook/plcrule.7.html → docbook/plcrule.1.html
diff --git a/docbook/plcset.7.html → docbook/plcset.1.html b/docbook/plcset.7.html → docbook/plcset.1.html
diff --git a/docbook/plcstat.7.html → docbook/plcstat.1.html b/docbook/plcstat.7.html → docbook/plcstat.1.html
diff --git a/docbook/plctest.7.html → docbook/plctest.1.html b/docbook/plctest.7.html → docbook/plctest.1.html
diff --git a/docbook/plctone.7.html → docbook/plctone.1.html b/docbook/plctone.7.html → docbook/plctone.1.html
diff --git a/docbook/plctool.7.html → docbook/plctool.1.html b/docbook/plctool.7.html → docbook/plctool.1.html
diff --git a/docbook/plcwait.7.html → docbook/plcwait.1.html b/docbook/plcwait.7.html → docbook/plcwait.1.html
diff --git a/docbook/psgraph.7.html → docbook/psgraph.1.html b/docbook/psgraph.7.html → docbook/psgraph.1.html
diff --git a/docbook/psin.7.html → docbook/psin.1.html b/docbook/psin.7.html → docbook/psin.1.html
diff --git a/docbook/pskey.7.html → docbook/pskey.1.html b/docbook/pskey.7.html → docbook/pskey.1.html
diff --git a/docbook/psnotch.7.html → docbook/psnotch.1.html b/docbook/psnotch.7.html → docbook/psnotch.1.html
diff --git a/docbook/psout.7.html → docbook/psout.1.html b/docbook/psout.7.html → docbook/psout.1.html
diff --git a/docbook/ptsctl.7.html → docbook/ptsctl.1.html b/docbook/ptsctl.7.html → docbook/ptsctl.1.html
diff --git a/docbook/rkey.7.html → docbook/rkey.1.html b/docbook/rkey.7.html → docbook/rkey.1.html
diff --git a/docbook/sada.7.html → docbook/sada.1.html b/docbook/sada.7.html → docbook/sada.1.html
diff --git a/docbook/sdram.7.html → docbook/sdram.1.html b/docbook/sdram.7.html → docbook/sdram.1.html
diff --git a/docbook/setpib.7.html → docbook/setpib.1.html b/docbook/setpib.7.html → docbook/setpib.1.html
diff --git a/docbook/ttycat.7.html → docbook/ttycat.1.html b/docbook/ttycat.7.html → docbook/ttycat.1.html
diff --git a/docbook/ttyrecv.7.html → docbook/ttyrecv.1.html b/docbook/ttyrecv.7.html → docbook/ttyrecv.1.html
diff --git a/docbook/ttysend.7.html → docbook/ttysend.1.html b/docbook/ttysend.7.html → docbook/ttysend.1.html
diff --git a/docbook/ttysig.7.html → docbook/ttysig.1.html b/docbook/ttysig.7.html → docbook/ttysig.1.html
diff --git a/docbook/weeder.7.html → docbook/weeder.1.html b/docbook/weeder.7.html → docbook/weeder.1.html
diff --git a/docbook/xml2pib.7.html → docbook/xml2pib.1.html b/docbook/xml2pib.7.html → docbook/xml2pib.1.html
diff --git a/ether/Makefile b/ether/Makefile
@@ -16,7 +16,7 @@ LDFLAGS+=
 TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9]
 FILES=Makefile *.mak *.sh *.c *.h 
 TOOLS=efbu efeu efru efsu edru edsu nics 
-PAGES=efbu.7 efeu.7 efru.7 efsu.7 edru.7 edsu.7 pcapdevs.7 nics.7
+PAGES=efbu.1 efeu.1 efru.1 efsu.1 edru.1 edsu.1 pcapdevs.1 nics.1
 
 # ====================================================================
 # pseudo targets;
@@ -31,7 +31,7 @@ library:
 scripts:
 manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
-install: compile library
+install: $(TOOLS) library
 	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}

diff --git a/ether/edru.7 → ether/edru.1 b/ether/edru.7 → ether/edru.1
@@ -1,4 +1,4 @@
-.TH edru 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH edru 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 edru - Qualcomm Atheros Ethernet II Data Read Utility

diff --git a/ether/edsu.7 → ether/edsu.1 b/ether/edsu.7 → ether/edsu.1
@@ -1,4 +1,4 @@
-.TH edsu 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH edsu 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 edsu - Qualcomm Atheros Ethernet II Data Send Utility

diff --git a/ether/efbu.7 → ether/efbu.1 b/ether/efbu.7 → ether/efbu.1
@@ -1,4 +1,4 @@
-.TH efbu 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH efbu 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 efbu - Ethernet Frame Blast Utility

diff --git a/ether/efeu.7 → ether/efeu.1 b/ether/efeu.7 → ether/efeu.1
@@ -1,4 +1,4 @@
-.TH efeu 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH efeu 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 efeu - HomePlug AV Packet Reflector

diff --git a/ether/efru.7 → ether/efru.1 b/ether/efru.7 → ether/efru.1
@@ -1,4 +1,4 @@
-.TH efru 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH efru 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 efru - HomePlug AV Packet Listener

diff --git a/ether/efsu.7 → ether/efsu.1 b/ether/efsu.7 → ether/efsu.1
@@ -1,4 +1,4 @@
-.TH efsu 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH efsu 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 efsu - Ethernet Frame Send Utility

diff --git a/ether/nics.7 → ether/nics.1 b/ether/nics.7 → ether/nics.1
@@ -1,4 +1,4 @@
-.TH nics 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH nics 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 nics - Host Network Interface Enumerator

diff --git a/ether/pcapdevs.7 → ether/pcapdevs.1 b/ether/pcapdevs.7 → ether/pcapdevs.1
@@ -1,4 +1,4 @@
-.TH pcapdevs 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH pcapdevs 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 pcapdevs - Qualcomm Atheros PCAP Device Enumerator

diff --git a/key/Makefile b/key/Makefile
@@ -13,16 +13,17 @@ include ../make.def
 
 CFLAGS+=
 LDFLAGS+=
-TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9]
-TOOLS=hpavkey hpavkeys rkey mac2pw mac2pwd libkeys.a
+TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9] *.a
+TOOLS=hpavkey hpavkeys rkey mac2pw mac2pwd
+LIBS=libkeys.a
 FILES=*.c *.h *.sh *.xml *.txt *.mak Makefile Makefile.*
-PAGES=hpavkey.7 hpavkeys.7 rkey.7 mac2pw.7 mac2pwd.7
+PAGES=hpavkey.1 hpavkeys.1 rkey.1 mac2pw.1 mac2pwd.1
 
 # ====================================================================
 # pseudo targets;
 # --------------------------------------------------------------------
 
-all compile: ${TOOLS}
+all compile: ${TOOLS} ${LIBS}
 compact: compile
 	if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi
 	if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi
@@ -31,7 +32,7 @@ library:
 scripts:
 manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
-install: compile
+install: $(TOOLS)
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}

diff --git a/key/hpavkey.7 → key/hpavkey.1 b/key/hpavkey.7 → key/hpavkey.1
@@ -1,4 +1,4 @@
-.TH hpavkey 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH hpavkey 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 hpavkey - HomePlug AV Key Generator

diff --git a/key/hpavkeys.7 → key/hpavkeys.1 b/key/hpavkeys.7 → key/hpavkeys.1
@@ -1,4 +1,4 @@
-.TH hpavkeys 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH hpavkeys 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 hpavkeys - HomePlug AV Key Generator

diff --git a/key/mac2pw.7 → key/mac2pw.1 b/key/mac2pw.7 → key/mac2pw.1
@@ -1,4 +1,4 @@
-.TH mac2pw 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mac2pw 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mac2pw - Qualcomm Atheros Ethernet Device Password Generator

diff --git a/key/mac2pwd.7 → key/mac2pwd.1 b/key/mac2pwd.7 → key/mac2pwd.1
@@ -1,4 +1,4 @@
-.TH mac2pwd 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mac2pwd 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mac2pwd - Qualcomm Atheros Ethernet Device Password Generator

diff --git a/key/rkey.7 → key/rkey.1 b/key/rkey.7 → key/rkey.1
@@ -1,4 +1,4 @@
-.TH rkey 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH rkey 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 rkey - HomePlug AV Random Key Generator

diff --git a/make.def b/make.def
@@ -66,7 +66,7 @@ STRIP=$(CROSS)strip
 # --------------------------------------------------------------------
 
 BIN=${ROOTFS}/usr/local/bin
-MAN=${ROOTFS}/usr/share/man/man7
+MAN=${ROOTFS}/usr/share/man/man1
 DOC=${ROOTFS}/home/www/software
 WWW=${ROOTFS}/home/www
 FTP=${ROOTFS}/home/ftp
@@ -106,6 +106,6 @@ VPATH=../applets:../debian:../docbook:../docbook2:../ether:../key:../mdio:../mme
 # --------------------------------------------------------------------
 
 CFLAGS=-Wall -Wextra -Wno-unused-parameter -DMAKEFILE -D__GETOPT_H__ -D_GETOPT_DEFINED_ $(EXTRA_CFLAGS)
-CXXFLAGS=-Wall -Wextra -Wno-unused-parameter -DMAKEFILE $(EXTRA_CXX_FLAGS)
-LDFLAGS=
+CXXFLAGS=-Wall -Wextra -Wno-unused-parameter -DMAKEFILE $(EXTRA_CXXFLAGS)
+LDFLAGS=$(EXTRA_LDFLAGS)
 
diff --git a/mdio/Makefile b/mdio/Makefile
@@ -16,7 +16,7 @@ LDFLAGS+=
 TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9]
 FILES=Makefile *.mak *.sh *.c *.h 
 TOOLS=mdioblock mdioblock2 mdiodump mdiogen
-PAGES=mdioblock.7 mdioblock2.7 mdiodump.7
+PAGES=mdioblock.1 mdioblock2.1 mdiodump.1
 
 # ====================================================================
 # pseudo targets;
@@ -31,7 +31,7 @@ library:
 scripts:
 manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
-install: compile library
+install: $(TOOLS) library
 	install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f int6k ${TOOLS}

diff --git a/mdio/mdioblock.7 → mdio/mdioblock.1 b/mdio/mdioblock.7 → mdio/mdioblock.1
@@ -1,4 +1,4 @@
-.TH mdioblock 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mdioblock 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mdioblock - Qualcomm Atheros Clause 22 MDIO Instruction Block Assembler

diff --git a/mdio/mdioblock2.7 → mdio/mdioblock2.1 b/mdio/mdioblock2.7 → mdio/mdioblock2.1
@@ -1,4 +1,4 @@
-.TH mdioblock2 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mdioblock2 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mdioblock2 - Qualcomm Atheros Clause 45 MDIO Instruction Block Assembler

diff --git a/mdio/mdiodump.7 → mdio/mdiodump.1 b/mdio/mdiodump.7 → mdio/mdiodump.1
@@ -1,4 +1,4 @@
-.TH mdiodump 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mdiodump 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mdiodump - Qualcomm Atheros MDIO Custom Module Analyser

diff --git a/mme/Makefile b/mme/Makefile
@@ -16,7 +16,7 @@ LDFLAGS+=
 TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9] *.out
 FILES=Makefile *.mak *.sh *.txt *.c *.h *.xml *.css
 TOOLS=hpav mme 
-PAGES=hpav.7 mme.7
+PAGES=hpav.1 mme.1
 
 # ====================================================================
 # pseudo targets;
@@ -31,7 +31,7 @@ library:
 scripts:
 manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
-install: compile library
+install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}

diff --git a/mme/hpav.7 → mme/hpav.1 b/mme/hpav.7 → mme/hpav.1
@@ -1,4 +1,4 @@
-.TH hpav 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH hpav 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 hpav - HomePlug AV Packet Listener

diff --git a/mme/mme.7 → mme/mme.1 b/mme/mme.7 → mme/mme.1
@@ -1,4 +1,4 @@
-.TH mme 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH mme 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 mme - Qualcomm Atheros vendor-specific message enumerator

diff --git a/nodes/Makefile b/nodes/Makefile
@@ -28,7 +28,7 @@ compact: compile
 library:
 #	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
 scripts manuals:
-install: compile library
+install: $(TOOLS) library
 #	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 #	cd ${BIN}; rm -f ${TOOLS}

diff --git a/nodes/xmledit.c b/nodes/xmledit.c
@@ -71,11 +71,11 @@ static void position (size_t extent)
 	}
 	if (offset > extent) 
 	{
-		error (XML_BAD_OFFSET, EPERM, "%s offset of 0x%04X exceeds " DATA_OBJECT " offset of 0x%04X", member, offset, extent);
+		error (XML_BAD_OFFSET, EPERM, "%s offset of 0x%04X exceeds " DATA_OBJECT " offset of 0x%04X", member, offset, (unsigned int) extent);
 	}
 	if ((offset + length) > extent) 
 	{
-		error (XML_BAD_EXTENT, EPERM, "%s length of %d bytes exceeds " DATA_OBJECT " length of %d bytes", member, length, extent);
+		error (XML_BAD_EXTENT, EPERM, "%s length of %d bytes exceeds " DATA_OBJECT " length of "SIZE_T_SPEC" bytes", member, length, extent);
 	}
 	return;
 }

diff --git a/nvm/Makefile b/nvm/Makefile
@@ -16,7 +16,7 @@ LDFLAGS+=
 TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9] *.test *-[0-9][0-9].nvm
 FILES=Makefile *.mak *.sh *.txt *.c *.h *.xml *.css
 TOOLS=chknvm chknvm2 nvmsplit nvmmerge
-PAGES=chknvm.7 chknvm2.7 nvmsplit.7 nvmmerge.7
+PAGES=chknvm.1 chknvm2.1 nvmsplit.1 nvmmerge.1
 
 # ====================================================================
 # pseudo targets;
@@ -31,7 +31,7 @@ manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
 library:
 	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
-install: compile library
+install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS}

diff --git a/nvm/chknvm.7 → nvm/chknvm.1 b/nvm/chknvm.7 → nvm/chknvm.1
@@ -1,4 +1,4 @@
-.TH chknvm 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH chknvm 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 chknvm - Qualcomm Atheros PLC Image File Validator

diff --git a/nvm/chknvm2.7 → nvm/chknvm2.1 b/nvm/chknvm2.7 → nvm/chknvm2.1
@@ -1,4 +1,4 @@
-.TH chknvm2 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH chknvm2 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 chknvm2 - Qualcomm Atheros PLC Image File Validator

diff --git a/nvm/manifest.c b/nvm/manifest.c
@@ -313,7 +313,7 @@ signed manifest (void const * memory, size_t extent)
 			printf ("\t%s: %d\n", nvm_fields [type], data);
 			break;
 		case NVM_FIELD_FREE_SPACE:
-			printf ("\t%s: %d/%d bytes\n", nvm_fields [type], size, extent);
+			printf ("\t%s: %d/"SIZE_T_SPEC" bytes\n", nvm_fields [type], size, extent);
 			break;
 		default:
 			error (0, 0, "%s: %d", nvm_fields [sizeof (nvm_fields) / sizeof (const char *) - 1], type);

diff --git a/nvm/nvmmerge.7 → nvm/nvmmerge.1 b/nvm/nvmmerge.7 → nvm/nvmmerge.1
@@ -1,4 +1,4 @@
-.TH nvmmerge 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH nvmmerge 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 nvmmerge - Qualcomm Atheros PLC Firmware Image File Splicer

diff --git a/nvm/nvmsplit.7 → nvm/nvmsplit.1 b/nvm/nvmsplit.7 → nvm/nvmsplit.1
@@ -1,4 +1,4 @@
-.TH nvmsplit 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH nvmsplit 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 nvmsplit - Qualcomm Atheros PLC Firmware Image File Slicer

diff --git a/pib/Makefile b/pib/Makefile
@@ -17,8 +17,8 @@ TRASH=*.o *.obj *.exe t t.* *~ *.[0-9][0-9][0-9] *.test
 FILES=Makefile *.mak *.sh *.txt *.c *.h *.xml *.css
 TOOLS=chkpib chkpib2 setpib getpib modpib pib2xml pibcomp pibdump pibruin xml2pib psin psout pskey
 TOOLS+=psgraph psnotch pibrump 
-PAGES=chkpib.7 chkpib2.7 setpib.7 getpib.7 modpib.7 pib2xml.7 pibcomp.7 pibdump.7 xml2pib.7 psin.7 psout.7 pskey.7
-# PAGES+=pibrump.7 pibruin.7 psgraph.7 psnotch.7  
+PAGES=chkpib.1 chkpib2.1 setpib.1 getpib.1 modpib.1 pib2xml.1 pibcomp.1 pibdump.1 xml2pib.1 psin.1 psout.1 pskey.1
+# PAGES+=pibrump.1 pibruin.1 psgraph.1 psnotch.1
 
 # ====================================================================
 # pseudo targets;
@@ -33,7 +33,7 @@ manuals:
 	install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN}
 library:
 	install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN}
-install: compile library
+install: $(TOOLS) library
 	install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN}
 uninstall:
 	cd ${BIN}; rm -f ${TOOLS} 

diff --git a/pib/chkpib.7 → pib/chkpib.1 b/pib/chkpib.7 → pib/chkpib.1
@@ -1,4 +1,4 @@
-.TH chkpib 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH chkpib 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 chkpib - Qualcomm Atheros PLC Parameter File Inspector

diff --git a/pib/chkpib2.7 → pib/chkpib2.1 b/pib/chkpib2.7 → pib/chkpib2.1
@@ -1,4 +1,4 @@
-.TH chkpib2 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH chkpib2 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 chkpib2 - Qualcomm Atheros PLC Parameter File Inspector

diff --git a/pib/getpib.7 → pib/getpib.1 b/pib/getpib.7 → pib/getpib.1
@@ -1,4 +1,4 @@
-.TH getpib 7 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
+.TH getpib 1 "March 2013" "plc-utils-2.1.5" "Qualcomm Atheros Powerline Toolkit"
 
 .SH NAME
 getpib - Qualcomm Atheros PIB Data Extractor 

diff --git a/pib/getpib.c b/pib/getpib.c
@@ -37,6 +37,7 @@
 #include <limits.h>
 #include <string.h>
 #include <ctype.h>
+#include <inttypes.h>
 
 /*====================================================================*
  *   custom header files;
@@ -174,7 +175,7 @@ static void getpib (int argc, char const * argv [], byte const * memory, size_t
 			{
 				error (1, ECANCELED, "%s exceeds PIB extent " SIZE_T_SPEC, object, extent);
 			}
-			printf ("%llu", LE64TOH (* number));
+			printf ("%" PRIu64, LE64TOH (* number));
 			memory += sizeof (* number);
 			extent -= sizeof (* number);
 		}
@@ -221,7 +222,7 @@ static void getpib (int argc, char const * argv [], byte const * memory, size_t
 			{
 				error (1, ECANCELED, "%s exceeds PIB extent " SIZE_T_SPEC, object, extent);
 			}
-			printf ("0x%016LX", LE64TOH (* number));
+			printf ("0x%016" PRIX64, LE64TOH (* number));
 			memory += sizeof (* number);
 			extent -= sizeof (* number);
 		}
@@ -435,7 +436,7 @@ int main (int argc, char const * argv [])
 	offset = (uint32_t)(basespec (* argv, 16, sizeof (uint32_t)));
 	if (offset > extent) 
 	{
-		error (1, ECANCELED, "PIB offset " SIZE_T_SPEC " exceeds PIB extent " SIZE_T_SPEC, offset, extent);
+		error (1, ECANCELED, "PIB offset " SIZE_T_SPEC " exceeds PIB extent " SIZE_T_SPEC, (size_t) offset, (size_t) extent);
 	}
 	argc--;
 	argv++;
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     *.[0-9][0-9][0-9]
     *.htm
-    *.html
     *.log
     *.o
     *.pib
@@ Expand Down @@