build mods

diff --git a/citadel/Makefile b/citadel/Makefile
index 726a39d6f4e5de5808b00baa859d3208b667bb30..afadac976edd29d0c624c0fa1de5de5e2e47c68b 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -1,9 +1,8 @@
 # Makefile for Citadel Server
 # Copyright (c) 1987-2022 by Art Cancro and the citadel.org team
-# 
-# This is the new and improved version that does not use the GNU Autotools,
-# because it is The Current Year and we aren't trying to build for weird
-# obscure systems anymore.
+#
+# No, we are NOT using the obsolete GNU Autotools.  This configure script works
+# well on the Linux operating system (which uses the Linux kernel) and on BSD.
 #
 # This program is open source software.  Use, duplication, and/or
 # disclosure are subject to the GNU General Purpose License version 3.

diff --git a/citadel/config.mk b/citadel/config.mk
deleted file mode 100644 (file)
index 68b0dd3..0000000
--- a/citadel/config.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# config.mk is generated by configure
-CTDLDIR := /root/citadel/citadel
-CFLAGS := -ggdb -DHAVE_OPENSSL -DBUILD_ID=\"v972-1-gc13dec1e4\" -DCTDLDIR=\"/root/citadel/citadel\"
-LDFLAGS :=  -lssl -lcrypto -lz

diff --git a/citadel/configure b/citadel/configure
index c7b6e94eea4c61f61c03c2e6ec47e500670856f7..9fe4e8819d12eabcf309229bf94c57d4f8b9573b 100755 (executable)
--- a/citadel/configure
+++ b/citadel/configure
@@ -110,7 +110,7 @@ cc $tempcc -o $tempfile && {
 
 
 ########################################################################
-# FIXME do a real build id here
+# The build ID can be generated from git or from the date
 ########################################################################
 CFLAGS=${CFLAGS}' -DBUILD_ID=\"'$(git describe 2>/dev/null || date +%y%03j)'\"'
 CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"'