SVN Commit by dpage: r4258 - tags/REL-1_2_2/pgadmin3/pkg/mac - Mailing list pgadmin-hackers

Author: dpage
Date: 2005-05-26 13:57:54 +0100 (Thu, 26 May 2005)
New Revision: 4258

Removed:
   tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile
   tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.in
   tags/REL-1_2_2/pgadmin3/pkg/mac/PgAdminIII.icns
Modified:
   tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.am
Log:
Fix mac package dir

Deleted: tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile
===================================================================
--- tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile    2005-05-26 12:48:09 UTC (rev 4257)
+++ tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile    2005-05-26 12:57:54 UTC (rev 4258)
@@ -1,226 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# pkg/mac/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# 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
-SHELL = /bin/sh
-
-srcdir = .
-top_srcdir = ../..
-
-prefix = /Users/pgadmin3/BuildRoots/pgadmin3-1.2/tmp
-exec_prefix = ${prefix}
-
-bindir = /Users/pgadmin3/BuildRoots/pgadmin3-1.2/pgAdmin3.app/Contents/MacOS
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = /Users/pgadmin3/BuildRoots/pgadmin3-1.2/pgAdmin3.app/Contents/SharedSupport
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
-mandir = ${prefix}/man
-includedir = ${prefix}/include
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/pgadmin3
-pkglibdir = $(libdir)/pgadmin3
-pkgincludedir = $(includedir)/pgadmin3
-top_builddir = ../..
-
-ACLOCAL = ${SHELL} /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/missing --run autoconf
-AUTOMAKE = ${SHELL} /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/missing --run autoheader
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = s,x,x,
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias =
-host_triplet = powerpc-apple-darwin7.9.0
-
-EXEEXT =
-OBJEXT = o
-PATH_SEPARATOR = :
-AMTAR = ${SHELL} /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/missing --run tar
-AWK = awk
-CC = gcc
-CXX = g++
-DEPDIR = .deps
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-PACKAGE = pgadmin3
-STRIP =
-VERSION = 1.2.1
-WX_CONFIG = /Users/pgadmin3/Installs/wxMac/2.6.0/bin/wx-config
-am__include = include
-am__quote =
-bundledir = /Users/pgadmin3/BuildRoots/pgadmin3-1.2/pgAdmin3.app
-install_sh = /Users/pgadmin3/BuildRoots/pgadmin3-1.2/config/install-sh
-pg_debug_build = no
-
-EXTRA_DIST = \
-    $(top_srcdir)/pkg/mac/Info.plist \
-    "$(top_srcdir)/pkg/mac/pgadmin3.icns" \
-    $(top_srcdir)/pkg/mac/PkgInfo
-
-subdir = pkg/mac
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
-    cd $(top_srcdir) && \
-      $(AUTOMAKE) --foreign  pkg/mac/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-    $(mkinstalldirs) $(distdir)/"$(top_srcdir)/pkg/mac $(distdir)/$(top_srcdir)/pkg/mac
-    @list='$(DISTFILES)'; for file in $$list; do \
-      if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-      dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-      if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-        dir="/$$dir"; \
-        $(mkinstalldirs) "$(distdir)$$dir"; \
-      else \
-        dir=''; \
-      fi; \
-      if test -d $$d/$$file; then \
-        if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-          cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-        fi; \
-        cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-      else \
-        test -f $(distdir)/$$file \
-        || cp -p $$d/$$file $(distdir)/$$file \
-        || exit 1; \
-      fi; \
-    done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-    @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-    $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-      INSTALL_STRIP_FLAG=-s \
-      `test -z '$(STRIP)' || \
-        echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-    -rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-    @echo "This command is intended for maintainers to use"
-    @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-    @$(NORMAL_INSTALL)
-    $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-    distclean-generic distdir dvi dvi-am info info-am install \
-    install-am install-data install-data-am install-exec \
-    install-exec-am install-info install-info-am install-man \
-    install-strip installcheck installcheck-am installdirs \
-    maintainer-clean maintainer-clean-generic mostlyclean \
-    mostlyclean-generic uninstall uninstall-am uninstall-info-am
-
-
-install-exec-hook:
-    $(install_sh_DATA) PkgInfo $(bundledir)/PkgInfo
-    $(install_sh_DATA) Info.plist $(bundledir)/Contents/Info.plist
-    $(install_sh_DATA) "pgadmin3.icns" "$(bundledir)/Contents/Resources/pgAdmin3.icns"
-    $$($(WX_CONFIG) --rezflags | sed 's/-t[[:space:]]*APPL//') \
-         "$(bundledir)/Contents/Resources/pgAdmin3.rsrc" -useDF
-    ./complete-bundle.sh "$(bundledir)"
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Modified: tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.am
===================================================================
--- tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.am    2005-05-26 12:48:09 UTC (rev 4257)
+++ tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.am    2005-05-26 12:57:54 UTC (rev 4258)
@@ -6,7 +6,7 @@

 EXTRA_DIST = \
     $(top_srcdir)/pkg/mac/Info.plist \
-    "$(top_srcdir)/pkg/mac/pgadmin3.icns" \
+    $(top_srcdir)/pkg/mac/pgadmin3.icns \
     $(top_srcdir)/pkg/mac/PkgInfo

 if APPBUNDLE

Deleted: tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.in
===================================================================
--- tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.in    2005-05-26 12:48:09 UTC (rev 4257)
+++ tags/REL-1_2_2/pgadmin3/pkg/mac/Makefile.in    2005-05-26 12:57:54 UTC (rev 4258)
@@ -1,226 +0,0 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# 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
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-AMTAR = @AMTAR@
-AWK = @AWK@
-CC = @CC@
-CXX = @CXX@
-DEPDIR = @DEPDIR@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-PACKAGE = @PACKAGE@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WX_CONFIG = @WX_CONFIG@
-am__include = @am__include@
-am__quote = @am__quote@
-bundledir = @bundledir@
-install_sh = @install_sh@
-pg_debug_build = @pg_debug_build@
-
-EXTRA_DIST = \
-    $(top_srcdir)/pkg/mac/Info.plist \
-    "$(top_srcdir)/pkg/mac/pgadmin3.icns" \
-    $(top_srcdir)/pkg/mac/PkgInfo
-
-subdir = pkg/mac
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
-    cd $(top_srcdir) && \
-      $(AUTOMAKE) --foreign  pkg/mac/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-    $(mkinstalldirs) $(distdir)/"$(top_srcdir)/pkg/mac $(distdir)/$(top_srcdir)/pkg/mac
-    @list='$(DISTFILES)'; for file in $$list; do \
-      if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-      dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-      if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-        dir="/$$dir"; \
-        $(mkinstalldirs) "$(distdir)$$dir"; \
-      else \
-        dir=''; \
-      fi; \
-      if test -d $$d/$$file; then \
-        if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-          cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-        fi; \
-        cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-      else \
-        test -f $(distdir)/$$file \
-        || cp -p $$d/$$file $(distdir)/$$file \
-        || exit 1; \
-      fi; \
-    done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-    @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-    $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-      INSTALL_STRIP_FLAG=-s \
-      `test -z '$(STRIP)' || \
-        echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-    -rm -f Makefile $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-    @echo "This command is intended for maintainers to use"
-    @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-    @$(NORMAL_INSTALL)
-    $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-    distclean-generic distdir dvi dvi-am info info-am install \
-    install-am install-data install-data-am install-exec \
-    install-exec-am install-info install-info-am install-man \
-    install-strip installcheck installcheck-am installdirs \
-    maintainer-clean maintainer-clean-generic mostlyclean \
-    mostlyclean-generic uninstall uninstall-am uninstall-info-am
-
-
-@APPBUNDLE_TRUE@install-exec-hook:
-@APPBUNDLE_TRUE@    $(install_sh_DATA) PkgInfo $(bundledir)/PkgInfo
-@APPBUNDLE_TRUE@    $(install_sh_DATA) Info.plist $(bundledir)/Contents/Info.plist
-@APPBUNDLE_TRUE@    $(install_sh_DATA) "pgadmin3.icns" "$(bundledir)/Contents/Resources/pgAdmin3.icns"
-@APPBUNDLE_TRUE@    $$($(WX_CONFIG) --rezflags | sed 's/-t[[:space:]]*APPL//') \
-@APPBUNDLE_TRUE@         "$(bundledir)/Contents/Resources/pgAdmin3.rsrc" -useDF
-@APPBUNDLE_TRUE@    ./complete-bundle.sh "$(bundledir)"
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Deleted: tags/REL-1_2_2/pgadmin3/pkg/mac/PgAdminIII.icns
===================================================================
(Binary files differ)