summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.txt4
-rw-r--r--www/hacking.html.in12
2 files changed, 10 insertions, 6 deletions
diff --git a/build.txt b/build.txt
index ae864e2f..86b5ff4b 100644
--- a/build.txt
+++ b/build.txt
@@ -105,6 +105,10 @@ running "scons prefix=<installation_root>". The default value is
"/usr/local". The envoronment variable DESTDIR also works in the
usual way.
+If your link fails with a message like "/usr/bin/ld: cannot find -lgps",
+you need to install chrpath. Note that after you have done so, you
+may need to run 'scons --config=force' to override the cached value.
+
If your scons fails with the complaint "No tool named 'textfile'",
you need to upgrade it. This feature was introduced during the long
interval after the 1.2.0 release; 1.2.1 and later versions will have it.
diff --git a/www/hacking.html.in b/www/hacking.html.in
index b9a5261e..c881bba5 100644
--- a/www/hacking.html.in
+++ b/www/hacking.html.in
@@ -1431,17 +1431,17 @@ will have a day or so to get their urgent fixes in.</dd>
<dd>It will need to be modified in SConstruct. Make sure the 'dev'
suffix is gone.</dd>
-<dt>5. Fix compiler and scan-build warnings.</dt>
+<dt>5. Update the NEWS file</dt>
+<dd>The version number on the top line needs to be match what's in
+SConstruct.</dd>
+
+<dt>6. Fix compiler and scan-build warnings.</dt>
<dd>Look for compiler and <a
href="http://devel.recluse.de/~bzed/scan-build/gpsd/">scan-build</a>
warnings and fix them.</dd>
-<dt>6. Update the NEWS file</dt>
-<dd>Also, make sure the topmost entry in the changelog portion of
-gpsd.spec.in is up-to-date and properly timestamped.</dd>
-
<dt>7. Update packaging/rpm/gpsd.spec.in</dt>
-<dd>Also, make sure the topmost entry in the changelog portion of
+<dd>Make sure the topmost entry in the changelog portion of
gpsd.spec.in is up-to-date and properly timestamped.</dd>
<dt>8. Run the regression tests and other checks</dt>