[Powerpc-utils-devel] [PATCH 1/7] Correct 'make dist'

[Nathan F. <nf...@au...>]

This update makes several corrections to the Makefile.am files
to correctly have all the files included when doing a 'make dist'.
This also updates configure.ac to put the install.sh, missing, and
depcomp file in the build-aux directory.

Signed-off-by: Nathan Fontenot <nf...@au...>
---

Index: powerpc-utils/configure.ac
===================================================================
--- powerpc-utils.orig/configure.ac	2009-11-12 09:38:29.000000000 -0600
+++ powerpc-utils/configure.ac	2009-11-16 15:12:46.000000000 -0600
@@ -2,8 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([powerpc-utils], [1.2.0], [nf...@au...])
-AM_INIT_AUTOMAKE
+AC_INIT([powerpc-utils], [1.2.1], [nf...@au...])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_SRCDIR([src/rtas_ibm_get_vpd.c])
 
 # Checks for programs.
@@ -34,5 +35,5 @@
 AC_FUNC_MKTIME
 AC_CHECK_FUNCS([memset strchr strcspn strdup strerror strrchr strstr strtol strtoul strtoull])
 
-AC_CONFIG_FILES(Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile src/drmgr/Makefile scripts/Makefile man/Makefile])
 AC_OUTPUT
Index: powerpc-utils/src/drmgr/Makefile.am
===================================================================
--- powerpc-utils.orig/src/drmgr/Makefile.am	2009-11-12 09:38:29.000000000 -0600
+++ powerpc-utils/src/drmgr/Makefile.am	2009-11-16 12:30:13.000000000 -0600
@@ -7,7 +7,7 @@
 		drcpu.h dr.h drmem.h drmgr.c drmig_chrp_pmig.c drpci.h	\
 		drslot_chrp_cpu.c drslot_chrp_hea.c drslot_chrp_mem.c	\
 		drslot_chrp_pci.c drslot_chrp_phb.c drslot_chrp_slot.c	\
-		ofdt.h rtas_calls.c rtas_call.h
+		ofdt.h rtas_calls.c rtas_calls.h
 
 lsslot_SOURCES = lsslot.c lsslot.h lsslot_chrp_cpu.c common.c		\
 		 common_cpu.c common_pci.c common_ofdt.c ofdt.h		\
Index: powerpc-utils/man/Makefile.am
===================================================================
--- powerpc-utils.orig/man/Makefile.am	2009-11-11 11:01:21.000000000 -0600
+++ powerpc-utils/man/Makefile.am	2009-11-16 15:12:45.000000000 -0600
@@ -4,3 +4,9 @@
 	   usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8	\
 	   hvcsadmin.8 rtas_dump.8 sys_ident.8 vscsisadmin.8
 
+dist_man_MANS = activate_firmware.8 ibmvscsis.conf.8 rtas_ibm_get_vpd.8	\
+	   uesensor.8 amsstat.1 ibmvscsis.sh.8 serv_config.8		\
+	   update_flash.8 amsvis.1 nvram.8 set_poweron_time.8		\
+	   usysattn.8 bootlist.8 ofpathname.8 snap.8 usysident.8	\
+	   hvcsadmin.8 rtas_dump.8 sys_ident.8 vscsisadmin.8
+
Index: powerpc-utils/scripts/Makefile.am
===================================================================
--- powerpc-utils.orig/scripts/Makefile.am	2009-11-11 11:01:21.000000000 -0600
+++ powerpc-utils/scripts/Makefile.am	2009-11-16 13:01:36.000000000 -0600
@@ -1,7 +1,13 @@
 bin_SCRIPTS = amsstat
+dist_bin_SCRIPTS = amsstat
 
 sbin_SCRIPTS = update_flash hvcsadmin vscsisadmin rtas_dump snap	\
 	       bootlist ofpathname lsdevinfo
 
+dist_sbin_SCRIPTS = update_flash hvcsadmin vscsisadmin rtas_dump snap	\
+	            bootlist ofpathname lsdevinfo
+
 initdir = /etc/init.d
 init_DATA = ibmvscsis.sh
+dist_init_DATA = ibmvscsis.sh
+
Index: powerpc-utils/Makefile.am
===================================================================
--- powerpc-utils.orig/Makefile.am	2009-11-11 11:01:21.000000000 -0600
+++ powerpc-utils/Makefile.am	2009-11-16 15:13:08.000000000 -0600
@@ -3,6 +3,11 @@
 
 docdir = $(datadir)/doc/packages/@PACKAGE@
 doc_DATA = README COPYRIGHT
+dist_doc_DATA = README COPYRIGHT
+
+EXTRA_DIST = Changelog powerpc-utils.spec doc/activate_firmware.doxycfg doc/nvram.doxycfg      \
+	     doc/rtas_ibm_get_vpd.doxycfg doc/serv_config.doxycfg doc/set_poweron_time.doxycfg \
+	     doc/uesensor.doxycfg doc/usysident.doxycfg
 
 IN_MAKEFILES = Makefile.in src/Makefile.in src/drmgr/Makefile.in man/Makefile.in \
 	       scripts/Makefile.in