summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 01:19:48 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 01:19:48 +0000
commitaf829b7a2b2141c5a7a9f38626c91655c27797ca (patch)
treec1e28844f9c8129a1465bf81f61ffcdffdb94d2a
parent7d6aee4eff3510179f712d831a9b9a712197a5b3 (diff)
downloadchromium_src-af829b7a2b2141c5a7a9f38626c91655c27797ca.zip
chromium_src-af829b7a2b2141c5a7a9f38626c91655c27797ca.tar.gz
chromium_src-af829b7a2b2141c5a7a9f38626c91655c27797ca.tar.bz2
linux: fix path in chromium-browser manpage
BUG=21598 Review URL: http://codereview.chromium.org/202066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26068 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/resources/manpage.1.in2
-rw-r--r--chrome/chrome.gyp3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/app/resources/manpage.1.in b/chrome/app/resources/manpage.1.in
index 36a2be8..26fc162 100644
--- a/chrome/app/resources/manpage.1.in
+++ b/chrome/app/resources/manpage.1.in
@@ -21,7 +21,7 @@ This manpage only describes invocation, environment, and arguments.
\fB\-\-user\-data\-dir\fR=\fIDIR\fR
Specifies the directory that user data (your "profile") is kept in.
Defaults to
-.IR ~/.config/@@FILENAME@@/Default .
+.IR ~/.config/@@CONFDIR@@/Default .
Separate instances of @@NAME@@ must use separate user data directories;
repeated invocations of @@FILENAME@@ will reuse an existing process for
a given user data directory.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 185f65c..b959019 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3083,11 +3083,13 @@
'variables': {
'name': 'Google Chrome',
'filename': 'google-chrome',
+ 'confdir': 'google-chrome',
},
}, { # else branding!="Chrome"
'variables': {
'name': 'Chromium',
'filename': 'chromium-browser',
+ 'confdir': 'chromium',
},
}],
],
@@ -3104,6 +3106,7 @@
'<@(_outputs)',
'-e', 's/@@NAME@@/<(name)/',
'-e', 's/@@FILENAME@@/<(filename)/',
+ '-e', 's/@@CONFDIR@@/<(confdir)/',
],
'message': 'Generating manpage'
},