mirror of
https://github.com/gnustep/apps-projectcenter.git
synced 2025-02-15 16:11:25 +00:00
Updates to prevent ProjectCenter from generating utterly broken makefiles wrt installation
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@24104 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4164ae01d8
commit
78a45e6a2e
6 changed files with 55 additions and 4 deletions
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
|||
2006-11-15 Nicola Pero <nicola@nicola-laptop>
|
||||
|
||||
* Modules/GNUmakefile.bundles (BUNDLE_INSTALL_DIR): Install the
|
||||
bundles in GNUSTEP_INSTALLATION_DIR, not in GNUSTEP_SYSTEM_ROOT.
|
||||
* Modules/ApplicationProject/PCAppProject.m ([PCAppProject
|
||||
-appendHead:]): Do not hardcode GNUSTEP_INSTALLATION_DIR in
|
||||
GNUmakefiles. See comments in the file for an explanation of how
|
||||
to improve PC's installation controls.
|
||||
* Modules/RenaissanceProject/PCRenaissanceProject.m
|
||||
([PCRenaissanceProject -appendHead:]): Same change.
|
||||
* Modules/ToolProject/PCToolProject.m ([PCToolProject
|
||||
-appendHead:]): Same change.
|
||||
* Modules/BundleProject/Resources/PC.project (INSTALLDIR): Install
|
||||
bundles by default in $(GNUSTEP_BUNDLES).
|
||||
|
||||
2006-10-21 15:41-EDT Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Resources/ProjectCenter.gorm: Corrected issue with dangling menu/
|
||||
|
|
|
@ -503,9 +503,21 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
/* FIXME - we should never hardcode installation information in
|
||||
* GNUmakefiles. Presumably you may want to pass this
|
||||
* information to make on the command line though! It shouldn't
|
||||
* be hardcoded in the makefile though. If we add the
|
||||
* functionality of passing it on the command-line, it should be
|
||||
* passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
|
||||
* than GNUSTEP_INSTALLATION_DIR. So we should also have the
|
||||
* user select an installation domain rather than an actual
|
||||
* directory (that would be pretty cool). -- Nicola
|
||||
*/
|
||||
/*
|
||||
[mff appendString:
|
||||
[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
|
||||
installDir]];
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
LIBRARIES = ("gnustep-base","gnustep-gui");
|
||||
LOCALIZED_RESOURCES = ();
|
||||
MAKEFILEDIR = "$(GNUSTEP_MAKEFILES)";
|
||||
INSTALLDIR = "$(HOME)/GNUstep/Library/Bundles";
|
||||
INSTALLDIR = "$(GNUSTEP_BUNDLES)";
|
||||
OBJC_COMPILEROPTIONS = "";
|
||||
OTHER_RESOURCES = ();
|
||||
OTHER_SOURCES = ();
|
||||
|
|
|
@ -20,5 +20,5 @@ ifeq ($(DO_LIB_LINK), yes)
|
|||
endif
|
||||
|
||||
BUNDLE_EXTENSION = .bundle
|
||||
BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources
|
||||
BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Applications/ProjectCenter.app/Resources
|
||||
$(PACKAGE_NAME)_STANDARD_INSTALL = no
|
||||
|
|
|
@ -502,9 +502,21 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
/* FIXME - we should never hardcode installation information in
|
||||
* GNUmakefiles. Presumably you may want to pass this
|
||||
* information to make on the command line though! It shouldn't
|
||||
* be hardcoded in the makefile though. If we add the
|
||||
* functionality of passing it on the command-line, it should be
|
||||
* passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
|
||||
* than GNUSTEP_INSTALLATION_DIR. So we should also have the
|
||||
* user select an installation domain rather than an actual
|
||||
* directory (that would be pretty cool). -- Nicola
|
||||
*/
|
||||
/*
|
||||
[mff appendString:
|
||||
[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
|
||||
installDir]];
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -304,9 +304,21 @@
|
|||
}
|
||||
else
|
||||
{
|
||||
[mff appendString:
|
||||
[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR = %@\n",
|
||||
/* FIXME - we should never hardcode installation information in
|
||||
* GNUmakefiles. Presumably you may want to pass this
|
||||
* information to make on the command line though! It shouldn't
|
||||
* be hardcoded in the makefile though. If we add the
|
||||
* functionality of passing it on the command-line, it should be
|
||||
* passed as in make GNUSTEP_INSTALLATION_DOMAIN=SYSTEM rather
|
||||
* than GNUSTEP_INSTALLATION_DIR. So we should also have the
|
||||
* user select an installation domain rather than an actual
|
||||
* directory (that would be pretty cool). -- Nicola
|
||||
*/
|
||||
/*
|
||||
[mff appendString:
|
||||
[NSString stringWithFormat: @"GNUSTEP_INSTALLATION_DIR = %@\n",
|
||||
installDir]];
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue