Re: [Monotone-devel] Re: a little status update

[Richard Levitte - VMS Whacker]

In message <address@hidden> on Mon, 06 Dec 2004 12:47:14 +0000, Bruce Stephens 
<address@hidden> said:

monotone> I think there are some minor merge problems:
monotone> 
monotone> make[2]: *** No rule to make target `unix/get_system_flavour.cc', 
needed by `unix/get_system_flavour.o'.  Stop.
monotone> make[2]: Leaving directory `/arch/monotone'


For the adventurous, the following change makes that particular file
unnecessary.  I'm not at all sure what get_system_flavour() is
supposed to do, but if it's only to put a value in a string, this
change should be harmless, and will get you past this particular
problem.  Of course, noone should commit this hack :-)...

# 
# patch "Makefile.am"
#  from [e830d35e955c9d602cf8f34e9d7cbceeb5e1150e]
#    to [12de6036be909637b8c4fbf9a4f886c19a8b695d]
# 
# patch "sanity.cc"
#  from [a2d21cafe939617f56e787f0b11c7c05040dd95d]
#    to [4c234caf0bdbcc36863b2a7382bf5bb39555d9bb]
# 
--- Makefile.am
+++ Makefile.am
@@ -102,7 +102,7 @@
        idna/punycode.h idna/stringprep.c idna/toutf8.c
 
 UNIX_PLATFORM_SOURCES = \
-       unix/read_password.cc unix/get_system_flavour.cc
+       unix/read_password.cc #unix/get_system_flavour.cc
 
 WIN32_PLATFORM_SOURCES = \
        win32/read_password.cc win32/get_system_flavour.cc
--- sanity.cc
+++ sanity.cc
@@ -32,7 +32,7 @@
   debug(false), quiet(false), logbuf(0xffff)
 {
   std::string flavour;
-  get_system_flavour(flavour);
+  // get_system_flavour(flavour);
   L(F("started up on %s\n") % flavour);
 }
 

Cheers,
Richard

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis