486036 - [PATCH] make install fails for Darwin/X11, but it should only die for OSX/Cocoa

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Jeremy Huddleston]

User-Agent:       Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1b3) Gecko/20090305 Firefox/3.1b3
Build Identifier: xulrunner 1.9.0.7 OSX/darwin X11

~/src/macports-trunk/dports/devel/xulrunner $ cat files/make-install.patch 
--- toolkit/mozapps/installer/packager.mk.bak	2009-03-30 17:04:13.000000000 -0700
+++ toolkit/mozapps/installer/packager.mk	2009-03-30 17:05:06.000000000 -0700
@@ -410,7 +410,10 @@ make-package: stage-package
 # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
 # prefix/lib/appname-devel-version/* symlinks to the above directories
 install:: stage-package
-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
+ifneq (,$(filter WINNT,$(OS_ARCH)))
+	$(error "make install" is not supported on this platform. Use "make package" instead.)
+endif
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	$(error "make install" is not supported on this platform. Use "make package" instead.)
 endif
 	$(NSINSTALL) -D $(DESTDIR)$(installdir)


Reproducible: Always

Comment 1

[Jeremy Huddleston]

Attachment: Darwin/gtk fix for make install target

I hope I'm doing the review process correctly.  Please tell me if setting "review" to "?" was not the correct thing to do.

Comment 2

[Benjamin Smedberg]

Comment on attachment 370262 [details] [diff] [review]
Darwin/gtk fix for make install target

This should be conditioned on MOZILLA_FS_LAYOUT

Comment 3

[Jeremy Huddleston]

Attachment: updated for MOZ_FS_LAYOUT

Comment 4

[Robert O'Callahan (:roc) (email my personal email if necessary)]

http://hg.mozilla.org/mozilla-central/rev/cf62d5aef19e

Thanks Jeremy!