X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=config.hh.in;h=d1eea7facd1eee3cbcae1940556392c4861bd27a;hb=3189be8f879384108e2d99fe83c972d68c5215dd;hp=1c16bed76b6f7c10c7b162884a1fe66dbf93def6;hpb=f6088d898c589dba6599bd4e3faa8e5c48f74084;p=lilypond.git

diff --git a/config.hh.in b/config.hh.in
index 1c16bed76b..d1eea7facd 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -1,13 +1,20 @@
 /* @AUTOGENERATE@ */
 
-/* Hmm */
 #define PACKAGE "@package@"
 
-/* default lilypond init and input dir */
-#define  DIR_DATADIR "@DIR_DATADIR@"
+/* datadir */
+#define DATADIR "@DATADIR@"
+
+/* LilyPond init and input base directory */
+#define PACKAGE_DATADIR "@PACKAGE_DATADIR@"
+#define LILYPOND_DATADIR PACKAGE_DATADIR
+
+/* LilyPond specific init and input directory */
+#define LOCAL_PACKAGE_DATADIR "@local_package_datadir@"
+#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