Index: configure.ac
===================================================================
RCS file: /projects/pgadmin3/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.35 -r1.36
--- configure.ac
+++ configure.ac
@@ -42,5 +42,12 @@
 AC_CONFIG_FILES([Makefile
                  src/Makefile
 		 pkg/Makefile
-		 pkg/mac/Makefile])
+		 pkg/debian/Makefile
+		 pkg/fc1/Makefile
+		 pkg/mac/Makefile
+		 pkg/mandrake/Makefile
+		 pkg/redhat/Makefile
+		 pkg/slackware/Makefile
+		 pkg/src/Makefile
+		 pkg/win32/Makefile])
 AC_OUTPUT
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -LMakefile.am -LMakefile.am -u -w -r1.38 -r1.39
--- Makefile.am
+++ Makefile.am
@@ -7,27 +7,7 @@
 EXTRA_DIST = \
 		$(top_srcdir)/README.txt \
 		$(top_srcdir)/BUGS.txt \
-		$(top_srcdir)/LICENCE.txt \
-		$(top_srcdir)/pkg/pgadmin3.desktop \
-		$(top_srcdir)/pkg/debian/rules \
-		$(top_srcdir)/pkg/debian/README.Debian \
-		$(top_srcdir)/pkg/debian/docs \
-		$(top_srcdir)/pkg/debian/dirs \
-		$(top_srcdir)/pkg/debian/copyright \
-		$(top_srcdir)/pkg/debian/control \
-		$(top_srcdir)/pkg/debian/changelog \
-		$(top_srcdir)/pkg/debian/make-deb \
-		$(top_srcdir)/pkg/debian/pgadmin3.menu \
-		$(top_srcdir)/pkg/fc1/pgadmin3.spec \
-		$(top_srcdir)/pkg/mandrake/pgadmin3.spec \
-		$(top_srcdir)/pkg/redhat/pgadmin3.spec \
-		$(top_srcdir)/pkg/slackware/build-release \
-		$(top_srcdir)/pkg/slackware/build-snapshot \
-		$(top_srcdir)/pkg/src/build-tarball \
-		$(top_srcdir)/pkg/win32/screen.bmp \
-		$(top_srcdir)/pkg/win32/banner.bmp \
-		$(top_srcdir)/pkg/win32/licence.rtf \
-		$(top_srcdir)/pkg/win32/pgadmin3.wsi
+		$(top_srcdir)/LICENCE.txt
 
 TMP_docs = \
 		$(top_srcdir)/docs/en_US/pg/*.html \
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/pkg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lpkg/Makefile.am -Lpkg/Makefile.am -u -w -r1.1 -r1.2
--- pkg/Makefile.am
+++ pkg/Makefile.am
@@ -3,4 +3,8 @@
 # This software is released under the Artistic Licence
 #
 # Makefile - Makefile for *nix systems
-SUBDIRS = mac
+
+SUBDIRS = debian fc1 mac mandrake redhat slackware src win32
+
+EXTRA_DIST = \
+		$(srcdir)/pgadmin3.desktop
--- /dev/null
+++ pkg/debian/Makefile.am
@@ -0,0 +1,15 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+EXTRA_DIST = \
+	$(srcdir)/README.Debian \
+	$(srcdir)/changelog \
+	$(srcdir)/control \
+	$(srcdir)/copyright 
+	$(srcdir)/dirs \
+	$(srcdir)/docs \
+	$(srcdir)/make-deb \
+	$(srcdir)/pgadmin3.menu \
+	$(srcdir)/rules
--- /dev/null
+++ pkg/fc1/Makefile.am
@@ -0,0 +1,8 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/pgadmin3.spec 
Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/pkg/mac/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lpkg/mac/Makefile.am -Lpkg/mac/Makefile.am -u -w -r1.1 -r1.2
--- pkg/mac/Makefile.am
+++ pkg/mac/Makefile.am
@@ -5,9 +5,9 @@
 # Makefile - Makefile for *nix systems
 
 EXTRA_DIST = \
-		$(top_srcdir)/pkg/mac/Info.plist \
-		"$(top_srcdir)/pkg/mac/pgadmin3.icns" \
-		$(top_srcdir)/pkg/mac/PkgInfo
+		$(srcdir)/Info.plist \
+		$(srcdir)/pgadmin3.icns \
+		$(srcdir)/PkgInfo
 
 if APPBUNDLE
 install-exec-hook:
--- /dev/null
+++ pkg/mandrake/Makefile.am
@@ -0,0 +1,8 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/pgadmin3.spec 
--- /dev/null
+++ pkg/redhat/Makefile.am
@@ -0,0 +1,8 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/pgadmin3.spec 
--- /dev/null
+++ pkg/slackware/Makefile.am
@@ -0,0 +1,9 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/build-release \
+	$(srcdir)/build-snapshot
--- /dev/null
+++ pkg/src/Makefile.am
@@ -0,0 +1,8 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/build-tarball
--- /dev/null
+++ pkg/win32/Makefile.am
@@ -0,0 +1,12 @@
+# pgAdmin III - PostgreSQL Tools
+# Copyright (C) 2002 - 2005, The pgAdmin Development Team
+# This software is released under the Artistic Licence
+#
+# Makefile - Makefile for *nix systems
+
+EXTRA_DIST = \
+	$(srcdir)/banner.bmp \
+	$(srcdir)/licence.rtf \
+	$(srcdir)/pgadmin3.wsi \
+	$(srcdir)/pgadmin3.wsm \
+	$(srcdir)/screen.bmp