TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix INSTALL_DIR

Browse Source
This commit is contained in:
David Rose 2004-06-04 15:44:06 +00:00
parent 5e0a902067
commit 7f94730a78
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ppremake/config_msvc.h
View File

@ -80,7 +80,7 @@
#define PACKAGE "ppremake"
/* The default value of INSTALL_DIR within ppremake. */
#define INSTALL_DIR C:\\Panda3d
#define INSTALL_DIR "C:\\Panda3d"
/**************** UPDATE VERSION NUMBER HERE ****************
** Also be sure to change the version number **

2
ppremake/configure.in
View File

@ -20,7 +20,7 @@ AC_CANONICAL_HOST
if test "${CXXFLAGS+set}" != set -a "${CFLAGS+set}" = set; then
CXXFLAGS=$CFLAGS
fi
CPPFLAGS="${CPPFLAGS} -DINSTALL_DIR="'$(prefix)'
CPPFLAGS="${CPPFLAGS} -DINSTALL_DIR='\""'$(prefix)'"\"'"
# Save these variables for later, so we can easily append to them or
# change them.

4
ppremake/ppScope.cxx
View File

@ -1683,7 +1683,7 @@ expand_standardize(const string &params) {
}
filename.standardize();
return filename;
return filename.get_fullpath();
}
@ -1704,7 +1704,7 @@ string PPScope::
expand_canonical(const string &params) {
Filename filename = trim_blanks(expand_string(params));
filename.make_canonical();
return filename;
return filename.get_fullpath();
}
////////////////////////////////////////////////////////////////////

17
ppremake/ppremake.cxx
View File

@ -10,7 +10,11 @@
#include "tokenize.h"
#include "sedProcess.h"
#ifdef HAVE_GETOPT
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_GETOPT
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif // HAVE_GETOPT_H
@ -18,18 +22,12 @@
#include "gnu_getopt.h"
#endif // HAVE_GETOPT
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <set>
#include <vector>
#include <algorithm>
#include <sys/stat.h>
#include <assert.h>
#define STRINGIZE(x) #x
bool unix_platform = false;
bool windows_platform = false;
bool dry_run = false;
@ -108,8 +106,7 @@ report_version() {
static void
report_install_dir() {
cerr << "Default value for INSTALL_DIR is "
<< STRINGIZE(INSTALL_DIR) << ".\n";
cerr << "Default value for INSTALL_DIR is " << INSTALL_DIR << ".\n";
}
static void
@ -353,7 +350,7 @@ main(int argc, char *argv[]) {
global_scope.define_variable("PLATFORM", platform);
global_scope.define_variable("PACKAGE_FILENAME", PACKAGE_FILENAME);
global_scope.define_variable("SOURCE_FILENAME", SOURCE_FILENAME);
global_scope.define_variable("INSTALL_DIR", STRINGIZE(INSTALL_DIR));
global_scope.define_variable("INSTALL_DIR", INSTALL_DIR);
if (got_ppremake_config) {
// If this came in on the command line, define a variable as such.