Merge pull request bluewaysw#271 from rabe-soft/localrev

Fixup the rev file handling fo a special case
jirkakunze · Dec 3, 2023 · ce83aac · ce83aac
2 parents 3c46181 + 8fbb8f6
commit ce83aac
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/Include/Win32/geos.mk b/Include/Win32/geos.mk
@@ -342,7 +342,20 @@ INSTALL_DIR	:= $(INSTALL_DIR:H)
 #	Obtain revision control information. Results are left in
 #	$(_REL) and $(_PROTO).
 #
-#if	defined(GEODE) && exists($(INSTALL_DIR)/$(GEODE).rev)
+#if defined(GEODE) && exists($(CURRENT_DIR)/$(GEODE).rev)
+## the .rev file is local, use it.
+REVFILE		= $(CURRENT_DIR)/$(GEODE).rev
+_GEODE 		:= $(GEODE)
+GREV		?= grev
+GREVFLAGS	=
+#
+# Don't use a branch option on a local .rev file
+# Pass the -s flag to automatically save the new revision number in the rev file
+
+_REL	!=	$(GREV) neweng $(REVFILE) $(GREVFLAGS) -R -s
+_PROTO	!=	$(GREV) getproto $(REVFILE) $(GREVFLAGS) -P
+
+#elif defined(GEODE) && exists($(INSTALL_DIR)/$(GEODE).rev)
 REVFILE		= $(INSTALL_DIR)/$(GEODE).rev
 
 #if $T == "Installed"
@@ -371,19 +384,6 @@ _REL    = $(_REL2:S/.1$/.$(GEOS_BUILD_NUMBER)/)
 _REL	= $(_REL2)
 #endif
 
-#elif defined(GEODE) && exists($(CURRENT_DIR)/$(GEODE).rev)
-## the .rev file is local, use it.
-REVFILE		= $(CURRENT_DIR)/$(GEODE).rev
-_GEODE 		:= $(GEODE)
-GREV		?= grev
-GREVFLAGS	=
-#
-# Don't use a branch option on a local .rev file
-# Pass the -s flag to automatically save the new revision number in the rev file
-
-_REL	!=	$(GREV) neweng $(REVFILE) $(GREVFLAGS) -R -s
-_PROTO	!=	$(GREV) getproto $(REVFILE) $(GREVFLAGS) -P
-
 #else
 
 _REL	=	0.0.0.0

diff --git a/Include/sun.geos.mk b/Include/sun.geos.mk
@@ -312,7 +312,20 @@ INSTALL_DIR	:= $(INSTALL_DIR:H)
 #	Obtain revision control information. Results are left in
 #	$(_REL) and $(_PROTO).
 #
-#if	defined(GEODE) && exists( $(INSTALL_DIR)/$(GEODE).rev )
+#if defined(GEODE) && exists($(CURRENT_DIR)/$(GEODE).rev)
+## the .rev file is local, use it.
+REVFILE		= $(CURRENT_DIR)/$(GEODE).rev
+_GEODE 		:= $(GEODE)
+GREV		?= grev
+GREVFLAGS	=
+#
+# Don't use a branch option on a local .rev file
+# Pass the -s flag to automatically save the new revision number in the rev file
+
+_REL	!=	$(GREV) neweng $(REVFILE) $(GREVFLAGS) -R -s
+_PROTO	!=	$(GREV) getproto $(REVFILE) $(GREVFLAGS) -P
+
+#elif defined(GEODE) && exists( $(INSTALL_DIR)/$(GEODE).rev )
 
 #if $T == "Installed"
 GREVTREE	= -I
@@ -338,19 +351,6 @@ _PROTO	!=	$(GREVCMD) newprotominor $(GEODE).rev
 _PROTO	!=	$(GREVCMD) getproto $(GEODE).rev
 #endif
 
-#elif defined(GEODE) && exists($(CURRENT_DIR)/$(GEODE).rev)
-## the .rev file is local, use it.
-REVFILE		= $(CURRENT_DIR)/$(GEODE).rev
-_GEODE 		:= $(GEODE)
-GREV		?= grev
-GREVFLAGS	=
-#
-# Don't use a branch option on a local .rev file
-# Pass the -s flag to automatically save the new revision number in the rev file
-
-_REL	!=	$(GREV) neweng $(REVFILE) $(GREVFLAGS) -R -s
-_PROTO	!=	$(GREV) getproto $(REVFILE) $(GREVFLAGS) -P
-
 #else
 
 _REL	=	0.0.0.0