Merge remote-tracking branch 'origin/moonshot-packaging-fixes' into HEAD

Conflicts:
	configs/Makefile.am
	msi/scripts/shib_uninstall_isapi_filter.vbs
	shibd/Makefile.am

diff --cc configs/Makefile.am
index 5377401,30d2fc6..f9abfd1
--- 1/configs/Makefile.am
--- 2/configs/Makefile.am
+++ b/configs/Makefile.am
@@@ -2,13 -2,14 +2,14 @@@
  
  AUTOMAKE_OPTIONS = foreign
  
- pkglibdir = ${libdir}/@PACKAGE@
- pkglogdir = ${localstatedir}/log/@PACKAGE@
+ pkglibdir = ${libdir}/@PACKAGE_NAME@
+ pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
 -shirelogdir = ${localstatedir}/log/httpd
 +shirelogdir = ${localstatedir}/log/apache2
- pkgxmldir = $(datadir)/xml/@PACKAGE@
- pkgwebdir = $(datadir)/@PACKAGE@
- pkgrundir = $(localstatedir)/run/@PACKAGE@
- pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+ pkgwebdir = $(datadir)/@PACKAGE_NAME@
+ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
+ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
  pkgsysconf_DATA = \
        shibd-redhat \
        shibd-suse \