Fix select/yield

[openldap] / include / setup.mak

diff --git a/include/setup.mak b/include/setup.mak
index 116cc0136bd9495944a522fc5f9f4c8771ca13d6..532acae501d9673482e0a224f0c2abe05935805e 100644 (file)
--- a/include/setup.mak
+++ b/include/setup.mak
@@ -4,12 +4,26 @@
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 #
 
+!include ../build/version.var
+
+!if "$(ol_patch)" != "X"
+ol_version=$(ol_major).$(ol_minor).$(ol_patch)
+ol_type=Release
+!elseif "$(ol_minor)" != "X"
+ol_version=$(ol_major).$(ol_minor).$(ol_patch)
+ol_type=Engineering
+!else
+ol_version=$(ol_major).$(ol_minor)
+ol_type=Devel
+!endif
+ol_string="$(ol_package) $(ol_version)-$(ol_type)"
+
 .SUFFIXES: .nt
 
 .nt.h:
        copy $*.nt $*.h
 
-all: setup.txt ol_version0.h
+all: setup.txt
 
 setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h setup.mak
        copy setup.mak setup.txt
@@ -17,7 +31,25 @@ setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h setup.mak
 lber_types.h: lber_types.nt
 ldap_config.h: ldap_config.nt
 ldap_features.h: ldap_features.nt
+
+# note - the edlin script has non-printable characters:
+# you must use a Ctrl-C to terminate the (i)nput command
 portable.h: portable.nt
+       echo Setting up $(ol_string)...
+       copy portable.nt portable.h
+       edlin portable.h < <<
+1,#sOPENLDAP_PACKAGE
+d
+i
+#define OPENLDAP_PACKAGE "$(ol_package)"
+\ 3
+
+1,#sOPENLDAP_VERSION
+d
+i
+#define OPENLDAP_VERSION "$(ol_version)"
+\ 3
+
+e
+<<NOKEEP
 
-ol_version0.h: ../build/version.h
-       $(CPP) /EP /D_OLV_PKG=\"OpenLDAP\" /D_OLV_VER=\"2.1.16\" -D_OLV_WHO=\"$(USERNAME)@$(COMPUTERNAME)\" $? > $@