summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Natano <natano@cvs.openbsd.org>2016-10-08 21:51:48 +0000
committerMartin Natano <natano@cvs.openbsd.org>2016-10-08 21:51:48 +0000
commitfa9c0073ee9a48542f50860fc07f1dab09e47607 (patch)
tree5e565e40f5c7e631bbd53605ab2aa8123122455b
parent9f7ca708124c9a5a3b0c9e7b228eed727b6ba5ce (diff)
ks_tables.h is always considered out of date due to the forced rebuild
of the makekeys util. This means it's also rebuilt during install. First as root during build, later by the BUILDUSER during release, which won't be able to rewrite it, because it's now owned by root. With this result: override rw-r--r-- root/wheel for ks_tables.h? One step closer towards noperm release builds for xenocara. ok matthieu
-rw-r--r--lib/libX11/src/Makefile.am4
-rw-r--r--lib/libX11/src/Makefile.in4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/libX11/src/Makefile.am b/lib/libX11/src/Makefile.am
index ceb836625..762acd75e 100644
--- a/lib/libX11/src/Makefile.am
+++ b/lib/libX11/src/Makefile.am
@@ -416,7 +416,5 @@ ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
mv ks_tables_h $@
-$(top_builddir)/src/util/makekeys$(EXEEXT): force
+$(top_builddir)/src/util/makekeys$(EXEEXT): $(top_builddir)/src/util/makekeys.c
cd util && $(MAKE)
-
-force:
diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in
index 2b663b286..fd2df3b7f 100644
--- a/lib/libX11/src/Makefile.in
+++ b/lib/libX11/src/Makefile.in
@@ -1387,11 +1387,9 @@ ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
mv ks_tables_h $@
-$(top_builddir)/src/util/makekeys$(EXEEXT): force
+$(top_builddir)/src/util/makekeys$(EXEEXT): $(top_builddir)/src/util/makekeys.c
cd util && $(MAKE)
-force:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: