Makefile: fix install target

Antonio Terceiro
1 parent 78efc270
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
Makefile
 VERSION = 7.5
 TARBALL = gitlab-deps-$(VERSION).tar.gz
+PREFIX = /usr
 WGET = wget
 GITLAB_BRANCH = 7-5-stable
 BUNDLE_OPTS = --verbose --without='development test'
@@ -13,8 +14,8 @@ $(TARBALL):
 	(git archive --prefix=gitlab-deps-$(VERSION)/ HEAD | gzip > $@) || ($(RM) $@; false)
  
 install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/lib/gitlab/vendor
-	$(RM) -r $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
+	mkdir -p						$(DESTDIR)$(PREFIX)/lib/gitlab/vendor
+	cp -r .bundle				$(DESTDIR)$(PREFIX)/lib/gitlab/.bundle
 	cp -r vendor/bundle $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
  
 update: clean bundle
1	1	VERSION = 7.5
2	2	TARBALL = gitlab-deps-$(VERSION).tar.gz
	3	+PREFIX = /usr
3	4	WGET = wget
4	5	GITLAB_BRANCH = 7-5-stable
5	6	BUNDLE_OPTS = --verbose --without='development test'
...	...	@@ -13,8 +14,8 @@ $(TARBALL):
13	14	(git archive --prefix=gitlab-deps-$(VERSION)/ HEAD \| gzip > $@) \|\| ($(RM) $@; false)
14	15
15	16	install: all
16		- mkdir -p $(DESTDIR)$(PREFIX)/lib/gitlab/vendor
17		- $(RM) -r $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
	17	+ mkdir -p $(DESTDIR)$(PREFIX)/lib/gitlab/vendor
	18	+ cp -r .bundle $(DESTDIR)$(PREFIX)/lib/gitlab/.bundle
18	19	cp -r vendor/bundle $(DESTDIR)$(PREFIX)/lib/gitlab/vendor/bundle
19	20
20	21	update: clean bundle
...	...