From 3fda8f516f04eb9c0a0f7622da4ed985c1a6a632 Mon Sep 17 00:00:00 2001 From: Steven Luo Date: Sun, 21 Feb 2010 22:19:01 -0800 Subject: [PATCH] Fix Makefile install targets The overhaul of the Makefile targets broke the dependencies of the install targets; fix this (along with a broken strip target in config-ui/Makefile). --- Makefile | 4 ++-- config-ui/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a5c6924..15c8199 100644 --- a/Makefile +++ b/Makefile @@ -28,11 +28,11 @@ dbus-server-glue.h: strip: $(APP) strip $(APP) -install: all +install: $(APP) mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/share/dbus-1/services mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon - install -c -m 0755 browser-switchboard $(DESTDIR)$(PREFIX)/bin + install -c -m 0755 $(APP) $(DESTDIR)$(PREFIX)/bin install -c -m 0644 com.nokia.osso_browser.service $(DESTDIR)$(PREFIX)/share/dbus-1/services install -c -m 0755 browser $(DESTDIR)$(PREFIX)/bin install -c -m 0755 microb $(DESTDIR)$(PREFIX)/bin diff --git a/config-ui/Makefile b/config-ui/Makefile index e5ec80b..d41444f 100644 --- a/config-ui/Makefile +++ b/config-ui/Makefile @@ -57,11 +57,11 @@ $(PLUGIN): $(plugin_obj) -c -o $@ $< strip: strip-plugin -strip-plugin: plugin +strip-plugin: $(PLUGIN) strip $(PLUGIN) install: install-plugin -install-plugin: plugin +install-plugin: $(PLUGIN) mkdir -p $(DESTDIR)$(PREFIX)/lib/hildon-control-panel mkdir -p $(DESTDIR)$(PREFIX)/share/applications/hildon-control-panel install -c -m 0755 $(PLUGIN) $(DESTDIR)$(PREFIX)/lib/hildon-control-panel -- 1.7.9.5