Changeset 6163 for branches/stable_5.0

Timestamp:

01/09/09 12:19:23 (3 years ago)

Author:

westram

Message:

• backport [6161] + [6162]

Location:

branches/stable_5.0

Files:

• Makefile (modified) (1 diff)
• SOURCE_TOOLS/update_config_makefile.pl (copied) (copied from trunk/SOURCE_TOOLS/update_config_makefile.pl)
• config.makefile.template (modified) (1 diff)

branches/stable_5.0/Makefile

@@ -391 +391 @@
                 @echo '$(ARBHOME)/$@:1: has been generated.'
                 @echo 'Please edit $@ to configure your system!'
-                @echo '(not needed for linux systems - simply type "make all")'
+                @echo --------------------------------------------------------------------------------
+                @false
 else
                 @echo '$(ARBHOME)/$<:1: is more recent than'
                 @echo '$(ARBHOME)/$@:1:'
                 @ls -al config.makefile*
-                @echo "you may either:"
-                @echo "- ignore it and touch $@"
-                @echo "- merge difference between $@ and $< (recommended)"
-                @echo "- remove $@, run make again and edit the freshly generated $@"
-endif
                 @echo --------------------------------------------------------------------------------
-                @false
+                @echo "Updating $@ (if this fails, check manually)"
+                SOURCE_TOOLS/update_config_makefile.pl
+                @echo "Sucessfully updated $@"
+                @echo --------------------------------------------------------------------------------
+                @ls -al config.makefile*
+                @echo --------------------------------------------------------------------------------
+                @echo "Diff to your old config.makefile:"
+                @echo --------------------------------------------------------------------------------
+                diff $@.bak $@
+                @echo --------------------------------------------------------------------------------
+endif
 
 # check if everything is configured correctly

branches/stable_5.0/config.makefile.template

@@ -16 +16 @@
 OPENGL := 1
 
-# 0 = use old PTSERVER
+# 0 = use old PTSERVER (recommended)
 # 1 = use the new PTPan implementation as pt-server (Not tested very well, do NOT use!)
 # 2 = compile both, use old (recommended for development only)
 PTPAN := 0
 
-ARB_64 := 0# compile 64bit ARB version (still very buggy!)
-#BUILDHOST_64 := 1# whether build host is 64bit (value defaults to ARB_64). Uncomment for Cross-Compile
+ARB_64 := 0# compile 64bit ARB version
+#BUILDHOST_64 := 1# whether build host is 64bit (value defaults to ARB_64). Needed for cross-compile
 
 # --------------------------------------------------------------------------------