3 files changed, 17 insertions, 15 deletions
diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile
index 40a39b57..46be2c72 100644
--- a/ipa-server/ipa-install/Makefile
+++ b/ipa-server/ipa-install/Makefile
@@ -1,5 +1,4 @@
-SHAREDIR=$(DESTDIR)/usr/share/ipa
-SBINDIR=$(DESTDIR)/usr/sbin
+include ../Makefile.common
 
 all: ;
 
@@ -7,9 +6,13 @@ install:
 	-mkdir $(SBINDIR)
 	install -m 755 ipa-server-install $(SBINDIR)
 	install -m 755 ipa-server-setupssl $(SHAREDIR)
-	$(MAKE) -C share $@
+
+	-mkdir -p $(SHAREDIR)
+	install -m 644 share/*.ldif $(SHAREDIR)
+	install -m 644 share/*.template $(SHAREDIR)
+
 	$(MAKE) -C test $@
 
 clean:
-	$(MAKE) -C share $@
 	rm -f *~ *.pyc
+	rm -f share/*~
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 462774ba..34666af5 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -128,10 +128,15 @@ def check_existing_installation():
     yesno = raw_input("Do you wish to remove it and create a new one? [no]: ")
     if not yesno or yesno.lower()[0] != "y":
         sys.exit(1)
+
+    try:
+        run(["/sbin/service", "dirsrv", "stop"])
+    except:
+        pass
     for d in dirs:
         serverid = os.path.basename(d).split("slapd-", 1)[1]
         if serverid:
-            erase_ds_instance_data (serverid)
+            erase_ds_instance_data(serverid)
 
 def get_fqdn():
     fqdn = ""
@@ -531,4 +536,7 @@ def main():
 
     return 0
 
-main()
+try:
+    main()
+except Exception, e:
+    print "Unexpected error - see ipaserver-install.log for details:\n %s" % str(e)
diff --git a/ipa-server/ipa-install/share/Makefile b/ipa-server/ipa-install/share/Makefile
index 380480bc..e69de29b 100644
--- a/ipa-server/ipa-install/share/Makefile
+++ b/ipa-server/ipa-install/share/Makefile
@@ -1,9 +0,0 @@
-SHAREDIR = $(DESTDIR)/usr/share/ipa
-
-install:
-	-mkdir -p $(SHAREDIR)
-	install -m 644 *.ldif $(SHAREDIR)
-	install -m 644 *.template $(SHAREDIR)
-
-clean:
-	rm -f *~