gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't fail if plmerge does not work.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19469 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-06-06 04:09:04 +00:00
parent d3fd109512
commit 28ce32e84c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -4,6 +4,9 @@
Mac OS X for all library combos (patch from Quentin Mathe
<gnustep-quentin@club-internet.fr>).
* Instance/application.make ($(APP_INFO_PLIST_FILE)): Don't fail
if plmerge does not work.
* Documentation/README.Cygwin: Update
* Documentation/machines.texi: Add Mac OS X section.
* Documentation/news.texi: Update.

2
Instance/application.make
View file

@ -259,7 +259,7 @@ $(APP_INFO_PLIST_FILE): $(GNUSTEP_STAMP_DEPEND) $(GNUSTEP_PLIST_DEPEND)
fi; \
echo " NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
echo "}") >$@$(END_ECHO)
$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
-$(ECHO_NOTHING)if [ -r "$(GNUSTEP_INSTANCE)Info.plist" ]; then \
plmerge $@ "$(GNUSTEP_INSTANCE)Info.plist"; \
fi$(END_ECHO)
endif