Merge from disorder.dev.

[disorder] / lib / defs.c

diff --git a/lib/defs.c b/lib/defs.c
index 494597e429e2c84beed2ce17d00cf583f6541808..633d56adb719b0785bfa01ab100e09c8cfd8fa3a 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -1,21 +1,19 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005 Richard Kettlewell
+ * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/defs.c @brief Definitions chosen by configure
  *
@@ -23,14 +21,13 @@
  * (see fix_path()), not so that the path can be ignored.
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include "defs.h"
 #include "definitions.h"
 
 /** @brief Software version number */
-const char disorder_version_string[] = VERSION;
+const char disorder_short_version_string[] = VERSION;
 
 /** @brief Package library directory */
 const char pkglibdir[] = PKGLIBDIR;
@@ -50,9 +47,17 @@ const char bindir[] = BINDIR;
 /** @brief System binary directory */
 const char sbindir[] = SBINDIR;
 
-/** @brief Fink binary directory */
+/** @brief System sendmail executable */
+const char sendmail_binary[] = SENDMAIL;
+
+/** @brief Fink binary directory
+ *
+ * Meaningless if not on a Mac.
+ */
 const char finkbindir[] = FINKBINDIR;
 
+#include "versionstring.h"
+
 /*
 Local Variables:
 c-basic-offset:2