Changeset 21417 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jul 9, 2009 8:01:56 AM (16 years ago)

Author:

vboxsync

Message:

more changes to the Linux guest additions convenience Makefile

File:

• trunk/src/VBox/Additions/linux/Makefile (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile

@@ -25 +25 @@
         @echo "*** Building 'vboxguest' module ***"
         @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
-        @cp vboxguest/vboxguest.*o .
+        @if [ -f vboxguest/vboxguest.ko ]; then \
+            cp vboxguest/vboxguest.ko .; \
+         else \
+            cp vboxguest/vboxguest.o .; \
+         fi
         @echo
         @if [ -d vboxvfs ]; then \
@@ -33 +37 @@
             echo "*** Building 'vboxvfs' module ***"; \
             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs; \
-            if [ -f vboxvfs/vboxvfs.o ]; then \
-              cp vboxvfs/vboxvfs.o .; \
+            if [ -f vboxvfs/vboxvfs.ko ]; then \
+                cp vboxvfs/vboxvfs.ko .; \
             else \
-              cp vboxvfs/vboxvfs.ko .; \
+                cp vboxvfs/vboxvfs.o .; \
             fi; \
         fi