Changeset 5558 in orxonox.OLD for branches/world_entities/src/lib/collision_detection

Timestamp:

Nov 13, 2005, 3:10:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

File:

• branches/world_entities/src/lib/collision_detection/Makefile.in (modified) (1 diff)

branches/world_entities/src/lib/collision_detection/Makefile.in

@@ -220 +220 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
+          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status