* lily/lexer.ll:

[lilypond.git] / config.hh.in

diff --git a/config.hh.in b/config.hh.in
index 6c58034b22d7ed3c5c5cb0d1d3badbd5abd7ea0c..5e276610b977510860771d606364dc6ca1f553d4 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,13 +1,22 @@
 /* @AUTOGENERATE@ */
 
-/* Hmm */
 #define PACKAGE "@package@"
 
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "@DIR_DATADIR@"
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
+
+/* datadir */
+#define DATADIR "@DATADIR@"
+
+/* LilyPond init and input base directory */
+#define PACKAGE_DATADIR DATADIR "/" PACKAGE
+#define LILYPOND_DATADIR PACKAGE_DATADIR
+
+/* LilyPond specific init and input directory */
+#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION
+#define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
 
 /* default lilypond locale dir */
-#define  DIR_LOCALEDIR "@DIR_LOCALEDIR@"
+#define LOCALEDIR "@LOCALEDIR@"
 
 /* define if you have memmem */
 #define HAVE_MEMMEM 0
@@ -73,6 +82,8 @@
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 
+/* define if you have sstream */
+#define HAVE_SSTREAM 0
 
 /* GUILE only includes version in headers (libguile/version.h) as of
    1.5.x.  For some strange reason, they call it SCM.*VERSION. */