Fixed a bug in the bsetroot build that caused really strange behaviour

diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index 258e3eab2573d9669d7cfeb38074e428e802b4de..0474fd1eeb5caa594adadbe0fd427f1ae3811745 100644 (file)
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -379,6 +379,9 @@ BaseDisplay::BaseDisplay(char *app_name, char *dpy_name) {
   MaskListLength = sizeof(MaskList) / sizeof(MaskList[0]);
   
   if (modmap) XFreeModifiermap(const_cast<XModifierKeymap*>(modmap));
+#else
+  NumLockMask = Mod2Mask;
+  ScrollLockMask = Mod5Mask;
 #endif // NOCLOBBER
 }
 

diff --git a/util/Makefile.am b/util/Makefile.am
index 3c75a4c4036069f87ffe41a18d6ca71ad765ee6b..50a0aebf6f440c59ad18076f1db79da336154ed5 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,7 +1,7 @@
 # util/Makefile.am for Openbox
 
 CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ \
-@ORDEREDPSEUDO@
+@ORDEREDPSEUDO@ @CLOBBER@
 
 bin_SCRIPTS =          bsetbg
 bin_PROGRAMS =         bsetroot

diff --git a/util/Makefile.in b/util/Makefile.in
index aefa5e99241ada3b9f91e4bb60618a7fc9e6ab77..27dc6bd8228a31df91cb06540645126e6b97188b 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -77,7 +77,7 @@ VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
-CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ @ORDEREDPSEUDO@
+CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @NEWWMSPEC@ @INTERLACE@ @ORDEREDPSEUDO@ @CLOBBER@
 
 
 bin_SCRIPTS = bsetbg