| @@ -1,17 +1,17 @@ | | | @@ -1,17 +1,17 @@ |
1 | $NetBSD: patch-ao,v 1.1 2014/11/03 12:18:32 ryoon Exp $ | | 1 | $NetBSD: patch-ao,v 1.2 2015/07/25 04:03:33 ryoon Exp $ |
2 | | | 2 | |
3 | --- toolkit/mozapps/installer/packager.mk.orig 2014-10-11 15:00:07.000000000 +0000 | | 3 | --- toolkit/mozapps/installer/packager.mk.orig 2014-10-11 15:00:07.000000000 +0000 |
4 | +++ toolkit/mozapps/installer/packager.mk | | 4 | +++ toolkit/mozapps/installer/packager.mk |
5 | @@ -788,9 +788,9 @@ endif | | 5 | @@ -788,9 +788,9 @@ endif |
6 | (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ | | 6 | (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ |
7 | (cd $(DESTDIR)$(installdir) && tar -xf -) | | 7 | (cd $(DESTDIR)$(installdir) && tar -xf -) |
8 | $(NSINSTALL) -D $(DESTDIR)$(bindir) | | 8 | $(NSINSTALL) -D $(DESTDIR)$(bindir) |
9 | - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) | | 9 | - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) |
10 | - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) | | 10 | - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) |
11 | -ifdef INSTALL_SDK # Here comes the hard part | | 11 | -ifdef INSTALL_SDK # Here comes the hard part |
12 | + $(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) | | 12 | + $(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) |
13 | + ln -s $(installdir)/firefox $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) | | 13 | + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) |
14 | +ifeq ($(MOZ_APP_NAME),xulrunner) | | 14 | +ifeq ($(MOZ_APP_NAME),xulrunner) |
15 | $(NSINSTALL) -D $(DESTDIR)$(includedir) | | 15 | $(NSINSTALL) -D $(DESTDIR)$(includedir) |
16 | (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ | | 16 | (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ |
17 | (cd $(DESTDIR)$(includedir) && tar -xf -) | | 17 | (cd $(DESTDIR)$(includedir) && tar -xf -) |