fix some dumb stuff in 'make install' targets

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/Make.defaults b/Make.defaults
index 2c63fc1..c169b93 100644 (file)
--- a/Make.defaults
+++ b/Make.defaults
@@ -1,11 +1,11 @@
-prefix ?= /usr
-exec_prefix    ?= $(prefix)
-libdir ?= $(exec_prefix)/lib64
-datadir        ?= $(prefix)/share
-mandir ?= $(datadir)/man
-includedir ?= $(prefix)/include
-bindir ?= $(exec_prefix)/bin
-PCDIR  ?= $(libdir)/pkgconfig
+PREFIX ?= /usr
+EXEC_PREFIX ?= $(PREFIX)
+LIBDIR ?= $(PREFIX)/lib64
+DATADIR        ?= $(PREFIX)/share
+MANDIR ?= $(DATADIR)/man
+INCLUDEDIR ?= $(PREFIX)/include
+BINDIR ?= $(EXEC_PREFIX)/bin
+PCDIR  ?= $(LIBDIR)/pkgconfig
 DESTDIR        ?=
 
 INSTALL ?= install

diff --git a/Make.deprecated b/Make.deprecated
new file mode 100644 (file)
index 0000000..a31b080
--- /dev/null
+++ b/Make.deprecated
@@ -0,0 +1,42 @@
+#
+# This is all stuff pjones should not have done the way he did initially, and
+# it's deprecated and will eventually go away.
+#
+
+ifneq ($(origin prefix),undefined)
+  ifeq ($(origin PREFIX),undefined)
+    override PREFIX = $(prefix)
+  endif
+endif
+ifneq ($(origin exec_prefix),undefined)
+  ifeq ($(origin EXEC_PREFIX),undefined)
+    override EXEC_PREFIX = $(exec_prefix)
+  endif
+endif
+ifneq ($(origin libdir),undefined)
+  ifeq ($(origin LIBDIR),undefined)
+    override LIBDIR = $(libdir)
+  endif
+endif
+ifneq ($(origin datadir),undefined)
+  ifeq ($(origin DATADIR),undefined)
+    override DATADIR = $(datadir)
+  endif
+endif
+ifneq ($(origin mandir),undefined)
+  ifeq ($(origin MANDIR),undefined)
+    override MANDIR = $(mandir)
+  endif
+endif
+ifneq ($(origin includedir),undefined)
+  ifeq ($(origin INCLUDEDIR),undefined)
+    override INCLUDEDIR = $(includedir)
+  endif
+endif
+ifneq ($(origin bindir),undefined)
+  ifeq ($(origin BINDIR),undefined)
+    override BINDIR = $(bindir)
+  endif
+endif
+
+# vim:ft=make

diff --git a/Make.rules b/Make.rules
index 54dec07..9ba4475 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -55,10 +55,10 @@ include $(TOPDIR)/Make.version
 define substitute-version
        sed                                             \
                -e "s,@@VERSION@@,$(VERSION),g"         \
-               -e "s,@@LIBDIR@@,$(libdir),g"           \
-               -e "s,@@PREFIX@@,$(prefix),g"           \
-               -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g"         \
-               -e "s,@@INCLUDEDIR@@,$(includedir),g"           \
+               -e "s,@@LIBDIR@@,$(LIBDIR),g"           \
+               -e "s,@@PREFIX@@,$(PREFIX),g"           \
+               -e "s,@@EXEC_PREFIX@@,$(EXEC_PREFIX),g"         \
+               -e "s,@@INCLUDEDIR@@,$(INCLUDEDIR),g"           \
                $(1) > $(2)
 endef
 

diff --git a/Makefile b/Makefile
index 0f28a37..a2943c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 TOPDIR = $(shell echo $$PWD)
 
+include $(TOPDIR)/Make.deprecated
 include $(TOPDIR)/Make.version
 include $(TOPDIR)/Make.rules
 include $(TOPDIR)/Make.defaults

diff --git a/docs/Makefile b/docs/Makefile
index fd37751..0f610d9 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,7 @@
 SRCDIR = $(realpath .)
 TOPDIR = $(realpath ..)
 
+include $(TOPDIR)/Make.deprecated
 include $(TOPDIR)/Make.version
 include $(TOPDIR)/Make.rules
 include $(TOPDIR)/Make.defaults
@@ -43,10 +44,10 @@ clean :
 test :
 
 install :
-       $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
-       $(foreach x, $(MAN1TARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)/$(mandir)/man1/;)
-       $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man3
-       $(foreach x, $(MAN3TARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)/$(mandir)/man3/;)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man1
+       $(foreach x, $(MAN1TARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)/$(MANDIR)/man1/;)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(MANDIR)/man3
+       $(foreach x, $(MAN3TARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)/$(MANDIR)/man3/;)
 
 .PHONY: all clean install
 

diff --git a/efivar.spec.in b/efivar.spec.in
index 3d857cc..180e537 100644 (file)
--- a/efivar.spec.in
+++ b/efivar.spec.in
@@ -38,7 +38,7 @@ git config --unset user.email
 git config --unset user.name
 
 %build
-make libdir=%{_libdir} bindir=%{_bindir} CFLAGS="$RPM_OPT_FLAGS -flto" LDFLAGS="$RPM_LD_FLAGS -flto"
+make LIBDIR=%{_libdir} BINDIR=%{_bindir} CFLAGS="$RPM_OPT_FLAGS -flto" LDFLAGS="$RPM_LD_FLAGS -flto"
 
 %install
 rm -rf $RPM_BUILD_ROOT

diff --git a/src/Makefile b/src/Makefile
index 27c9dae..4dd3379 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
 SRCDIR = $(realpath .)
 TOPDIR = $(realpath ..)
 
+include $(TOPDIR)/Make.deprecated
 include $(TOPDIR)/Make.version
 include $(TOPDIR)/Make.rules
 include $(TOPDIR)/Make.defaults
@@ -86,18 +87,18 @@ clean :
        @rm -rfv .*.P .*.h.P *.S.P include/efivar/.*.h.P
 
 install : all
-       $(INSTALL) -d -m 755 $(DESTDIR)$(libdir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
        $(foreach x,$(LIBTARGETS), \
-               $(INSTALL) -m 755 $(x) $(DESTDIR)$(libdir)/$(x).1.$(VERSION) ;\
-               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x).1 ;\
-               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\
+               $(INSTALL) -m 755 $(x) $(DESTDIR)$(LIBDIR)/$(x).1.$(VERSION) ;\
+               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x).1 ;\
+               ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x) ;\
                )
        $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
        $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
-       $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar
-       $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));)
-       $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
-       $(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(bindir);)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/efivar
+       $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(INCLUDEDIR)/efivar/$(notdir $(x));)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
+       $(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(BINDIR);)
 
 test : all
        $(MAKE) -C test $@