(PROGRAM_INSTALL_DIR): New define.

(install-local, uninstall-local): Use it.

svn path=/trunk/mcs/; revision=29303

mcs/tools/ChangeLog

@@ -1,3 +1,8 @@
+2004-06-11  Raja R Harinath  <[email protected]>
+
+	* Makefile (PROGRAM_INSTALL_DIR): New define.
+	(install-local, uninstall-local): Use it.
+
 2004-05-27  Duncan Mak  <[email protected]>
 
 	* Makefile (Module): Add mono-rpm-helpers

mcs/tools/Makefile

@@ -8,6 +8,8 @@ MONO_TOOLS = \
 	EnumCheck.exe 		\
 	IFaceDisco.exe
 
+PROGRAM_INSTALL_DIR = $(prefix)/bin
+
 DISTFILES = \
 	assemblies.xml			\
 	DumpCultureInfo.cs		\
@@ -30,14 +32,14 @@ DISTFILES = \
 all-local: $(MONO_TOOLS)
 
 install-local: all-local
-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
+	$(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 	for t in $(MONO_TOOLS) ; do \
-	   $(INSTALL_BIN) $$t $(DESTDIR)$(prefix)/bin ; \
+	   $(INSTALL_BIN) $$t $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
 	done
 
 uninstall-local:
 	for t in $(MONO_TOOLS) ; do \
-	   rm -f $(DESTDIR)$(prefix)/bin/$$t ; \
+	   rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$$t ; \
 	done
 
 test-local run-test-local:

mcs/tools/corcompare/ChangeLog

@@ -1,3 +1,8 @@
+2004-06-11  Raja R Harinath  <[email protected]>
+
+	* Makefile (PROGRAM_INSTALL_DIR): New define.
+	(install-local, uninstall-local): Use it.
+
 2004-06-04  Gert Driesen <[email protected]>
 
 	* mono-api-info.cs: for checking API compatibility, we're only

mcs/tools/corcompare/Makefile

@@ -21,6 +21,8 @@ CORCOMPARE_SOURCES = \
 	MissingType.cs \
 	ToDoAssembly.cs
 
+PROGRAM_INSTALL_DIR = $(prefix)/bin
+
 APIINFO_SOURCES = mono-api-info.cs
 APIDIFF_SOURCES = mono-api-diff.cs
 
@@ -29,14 +31,14 @@ DISTFILES= $(CORCOMPARE_SOURCES) $(APIINFO_SOURCES) $(APIDIFF_SOURCES)
 all-local: $(ALL_PROGRAMS)
 
 install-local: $(ALL_PROGRAMS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
+	$(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 	for i in $(ALL_PROGRAMS) ; do \
-		$(INSTALL_BIN) $$i $(DESTDIR)$(prefix)/bin ; \
+		$(INSTALL_BIN) $$i $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
 	done
 
 uninstall-local:
 	for i in $(ALL_PROGRAMS) ; do \
-	    rm -f $(DESTDIR)$(prefix)/bin/$$i ; \
+	    rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$$i ; \
 	done
 
 test-local:

mcs/tools/security/ChangeLog

@@ -1,3 +1,8 @@
+2004-06-11  Raja R Harinath  <[email protected]>
+
+	* Makefile (PROGRAM_INSTALL_DIR): New define.
+	(install-local, uninstall-local): Use it.
+
 2004-06-09  Sebastien Pouliot  <[email protected]>
 
 	* StrongNameManager.cs: Fix ToString() when no verificationSettings

mcs/tools/security/Makefile

@@ -6,6 +6,7 @@ include ../../build/rules.make
 LOCAL_MCS_FLAGS = /lib:../class/lib/default /r:Mono.Security.dll
 
 SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe
+PROGRAM_INSTALL_DIR = $(prefix)/bin
 
 DISTFILES = \
 	AssemblyInfo.cs	\
@@ -22,15 +23,16 @@ DISTFILES = \
 
 all-local: $(SECURITY_PROGRAMS)
 
+
 install-local: $(SECURITY_PROGRAMS)
-	$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
+	$(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 	for p in $(SECURITY_PROGRAMS) ; do \
-	    $(INSTALL_BIN) $$p $(DESTDIR)$(prefix)/bin ; \
+	    $(INSTALL_BIN) $$p $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
 	done
 
 uninstall-local:
 	for p in $(SECURITY_PROGRAMS) ; do \
-	    rm -f $(DESTDIR)$(prefix)/bin/$$p ; \
+	    rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$$p ; \
 	done
 
 test-local: