summaryrefslogtreecommitdiff
blob: bcf2487656c2dbbd7c9f4a9711274e61fdc48dc2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- config/Make.rules.old	2006-01-19 21:47:21.000000000 +0900
+++ config/Make.rules	2006-01-19 14:13:37.000000000 +0900
@@ -12,7 +12,7 @@
 # if it does not exist.
 #
 
-prefix			= /opt/Ice-$(VERSION)
+prefix			= $(DESTDIR)/usr
 
 #
 # Define OPTIMIZE as yes if you want to build with
@@ -154,9 +154,9 @@
 endif
 
 install_includedir	= $(prefix)/include
-install_slicedir	= $(prefix)/slice
+install_slicedir	= $(prefix)/share/ice-$(VERSION)/slice
 install_schemadir	= $(prefix)/schema
-install_docdir		= $(prefix)/doc
+install_docdir		= $(prefix)/share/doc/ice-$(VERSION)
 
 INSTALL			= cp -fp
 INSTALL_PROGRAM		= ${INSTALL}
--- Makefile.old	2006-01-19 05:24:42.000000000 +0900
+++ Makefile	2006-01-19 13:37:03.000000000 +0900
@@ -19,7 +19,7 @@
 	@if test ! -d $(prefix) ; \
 	then \
 	    echo "Creating $(prefix)..." ; \
-	    $(call mkdir,$(prefix)) ; \
+	    mkdir -p $(prefix) ; \
 	fi
 
 	@for subdir in $(INSTALL_SUBDIRS); \
@@ -27,7 +27,7 @@
 	    if test ! -d $$subdir ; \
 	    then \
 		echo "Creating $$subdir..." ; \
-		mkdir $$subdir ; \
+		mkdir -p $$subdir ; \
 		chmod a+rx $$subdir ; \
 	    fi ; \
 	done
@@ -47,8 +47,8 @@
 	then \
 	    ( cd doc && $(MAKE) install ) || exit 1 ; \
 	fi
-	$(call installdata,ICE_LICENSE,$(prefix))
-	$(call installdata,LICENSE,$(prefix))
+	$(call install_docdir,ICE_LICENSE,$(prefix))
+	$(call install_docdir,LICENSE,$(prefix))
 
 clean::
 	@if test -d doc ; \