Shuffle some code betweem Makefiles to resume building the Mac bundle…

… directory after the src directory reorganization. Update the bundle copyright date. Remove a temporary comment regarding the directory reorg. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4659 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 12, 2006 · 1d3416d · 1d3416d
1 parent 8e0fa7b
commit 1d3416d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -8,6 +8,9 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+if HAVE_QTMAC
+MAC = mac
+endif
 # NOTE - the order of the SUBDIRS is important. Currently the providers
 #        depend on the existence of libqgis_gui. 
 #        gui *must* be specified immediately before the providers

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -13,15 +13,6 @@
 ##        Initial setup 
 ## ----------------------------------------------------------------------
 ##
-if HAVE_QTMAC
-MAC = mac
-endif
-# NOTE - the order of the SUBDIRS is important. Currently the providers
-#        depend on the existence of libqgis_gui. Since the gui classes
-#        have not been moved into their own directory, the current directory
-#        (.) must be specified immediately before the providers
-#        subdirectory. Once the gui subdirectory is implemented, there is
-#        no need for the current directory to be in the SUBDIRS list
 
 if !HAVE_QTMAC
 PREFIX=-DPREFIX=\"$(prefix)\"

diff --git a/src/mac/Contents/Info.plist.in b/src/mac/Contents/Info.plist.in
@@ -11,7 +11,7 @@
 	<key>CFBundleSignature</key>
 	<string>QGIS</string>
 	<key>CFBundleGetInfoString</key>
-	<string>QGIS @VERSION, © 2002-2005 QGIS Development Team</string>
+	<string>QGIS @VERSION, © 2002-2006 QGIS Development Team</string>
 	<key>CFBundleShortVersionString</key>
 	<string>@SHORTVERSION</string>
 	<key>CFBundleVersion</key>