summaryrefslogtreecommitdiff
blob: 792cd2fd58c4350b8293179ea00ecd5f48dfa40a (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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
--- comp/Makefile.am.orig	2008-11-01
+++ comp/Makefile.am	2008-11-01
@@ -4,44 +4,44 @@
 ##AUTOMAKE_OPTIONS = dist-bzip2
 
 install-exec-local:
-	@if test "x$(ROOT)" != "x"; then \
-	 echo "Installing with ROOT=$(ROOT)"; \
-         echo; \
-        fi
-
-	@if test "x$(DESTDIR)" != "x"; then \
-	 echo "Installing with DESTDIR=$(DESTDIR)"; \
-         echo; \
-	 ROOT=$DESTDIR; \
-        fi
-	
-	@echo "Running the informer again because of dependencies between information files"
-	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix)
-	
-	@echo "Installing the components..."
-	@(cd $(srcdir)/src; d=`pwd`; for p in `cat order`; do \
-	  echo "Compiling $$p..."; \
-	  cd $$d/$$p; \
-	  $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-	  $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-	  rm -rf .gambas; \
-	  echo "Installing $$p..."; \
-	  $(INSTALL) $$p.gambas $(DESTDIR)$(gblibdir); \
-	  $(INSTALL) .component $(DESTDIR)$(gblibdir)/$$p.component; \
-	  chmod a-x $(DESTDIR)$(gblibdir)/$$p.component; \
-	  $(INSTALL) .info $(DESTDIR)$(gbdatadir)/info/$$p.info; \
-	  chmod a-x $(DESTDIR)$(gbdatadir)/info/$$p.info; \
-	  $(INSTALL) .list $(DESTDIR)$(gbdatadir)/info/$$p.list; \
-	  chmod a-x $(DESTDIR)$(gbdatadir)/info/$$p.list; \
-	  done; true)
+	@echo "=== Installing the components ==="; \
+	echo
+
+	@if test -n "$(ROOT)"; then \
+		echo "Installing with ROOT=$(ROOT)"; \
+	fi; \
+	if test -n "$(DESTDIR)"; then \
+		echo "Installing with DESTDIR=$(DESTDIR)"; \
+		ROOT=$DESTDIR; \
+	fi; \
+	echo
+
+	@echo "Running the informer again because of dependencies between information files"; \
+	$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix); \
+	echo
+
+	@(for p in `cat $(srcdir)/src/order`; do \
+		echo -n "Compiling  $$p ... "; \
+		cd $(abs_srcdir)/src/$$p; \
+		if $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); then \
+			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
+			echo "Installing $$p"; \
+			rm -rf .gambas; \
+			$(INSTALL) $$p.gambas $(DESTDIR)$(gblibdir); \
+			$(INSTALL) -c -m 644 .component $(DESTDIR)$(gblibdir)/$$p.component; \
+			$(INSTALL) -c -m 644 .info $(DESTDIR)$(gbdatadir)/info/$$p.info; \
+			$(INSTALL) -c -m 644 .list $(DESTDIR)$(gbdatadir)/info/$$p.list; \
+		fi \
+	done); \
+	echo
 
 uninstall-local:
-	@(cd $(srcdir)/src; for p in *; do \
-	  rm -f $(DESTDIR)$(gblibdir)/$$p.gambas; \
-	  rm -f $(DESTDIR)$(gblibdir)/$$p.component; \
-	  rm -f $(DESTDIR)$(gbdatadir)/info/$$p.info; \
-	  rm -f $(DESTDIR)$(gbdatadir)/info/$$p.list; \
-	  done)
+	@(for p in `cat $(srcdir)/src/order`; do \
+		rm -f $(DESTDIR)$(gblibdir)/$$p.gambas; \
+		rm -f $(DESTDIR)$(gblibdir)/$$p.component; \
+		rm -f $(DESTDIR)$(gbdatadir)/info/$$p.info; \
+		rm -f $(DESTDIR)$(gbdatadir)/info/$$p.list; \
+	done)
 
 dist-hook:
 	@(cd $(distdir)/src; rm -rf `find . -name ".gambas" -o -name ".lock" -o -name ".xvpics" -o -name "*~" -o -name "*.out"  -o -name "*.pot" -o -name "*.gambas" -o -name "core.*" -o -name ".kdbg*" -o -name ".svn"`;)