Merge "Revert "hnvram: rename hnvram binary""
diff --git a/Makefile b/Makefile
index 319f0f2..2f3aa95 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,10 @@
DIRS+=conman
endif
-BINDIR=$(DESTDIR)/bin
+PREFIX=/usr
+BINDIR=$(DESTDIR)$(PREFIX)/bin
+LIBDIR=$(DESTDIR)$(PREFIX)/lib
+
all: $(addsuffix /all,$(DIRS)) build-optionspy
test: $(addsuffix /test,$(DIRS))
@@ -94,15 +97,6 @@
install:
set -e; for d in $(DIRS); do $(MAKE) -C $$d install; done
$(MAKE) install-optionspy
- mkdir -p $(BINDIR)
- rm -fv $(BINDIR)/hnvram
-ifeq ($(BR2_TARGET_GENERIC_PLATFORM_NAME), gfmn110)
- ln -s /bin/hnvram_wrapper $(BINDIR)/hnvram
-else ifeq ($(BR2_TARGET_GENERIC_PLATFORM_NAME), gflt110)
- ln -s /bin/hnvram_wrapper $(BINDIR)/hnvram
-else
- ln -s /bin/hnvram_binary $(BINDIR)/hnvram
-endif
sysmgr/all: base/all libstacktrace/all libexperiments/all
cmds/all: libstacktrace/all libexperiments/all
diff --git a/hnvram/Makefile b/hnvram/Makefile
index c0b8242..c3368cb 100644
--- a/hnvram/Makefile
+++ b/hnvram/Makefile
@@ -29,7 +29,7 @@
install:
mkdir -p $(BINDIR)
- cp hnvram $(BINDIR)/hnvram_binary
+ cp hnvram $(BINDIR)
install-libs:
@echo "No libs to install."
