Index: osprey/cygnus/bfd/po/Make-in
===================================================================
--- osprey/cygnus/bfd/po/Make-in	(revision 3323)
+++ osprey/cygnus/bfd/po/Make-in	(working copy)
@@ -78,7 +78,7 @@
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
Index: osprey/cygnus/opcodes/po/Make-in
===================================================================
--- osprey/cygnus/opcodes/po/Make-in	(revision 3323)
+++ osprey/cygnus/opcodes/po/Make-in	(working copy)
@@ -72,7 +72,7 @@
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
Index: osprey/cygnus/ld/po/Make-in
===================================================================
--- osprey/cygnus/ld/po/Make-in	(revision 3323)
+++ osprey/cygnus/ld/po/Make-in	(working copy)
@@ -72,7 +72,7 @@
 	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	file=`echo $* | sed 's,.*/,,'`.gmo \
 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
Index: osprey/libhugetlbfs/Makefile.gbase
===================================================================
--- osprey/libhugetlbfs/Makefile.gbase	(revision 3323)
+++ osprey/libhugetlbfs/Makefile.gbase	(working copy)
@@ -33,7 +33,7 @@
 LDSCRIPT_DIST_ELF = elf32ppclinux elf64ppc elf_i386 elf_x86_64
 INSTALL_OBJSCRIPT = ld.hugetlbfs
 VERSION=version.h
-SOURCE = $(shell find $(BUILD_BASE) -maxdepth 1 ! -name version.h -a -name '*.[h]')
+SOURCE = $(shell find $(BUILD_BASE) -maxdepth 1 -name '*.[h]')
 SOURCE += $(BUILD_BASE)/*.c $(BUILD_BASE)/*.lds $(BUILD_BASE)/Makefile
 NODEPTARGETS=<version.h> <clean>
 
@@ -42,7 +42,7 @@
 LDFLAGS += --no-undefined-version -Wl,--version-script=$(BUILD_BASE)/version.lds
 CFLAGS ?= -O2 -g -DOPEN64_MOD -DM_PAGE
 CFLAGS += -Wall -fPIC
-CPPFLAGS += -D__LIBHUGETLBFS__
+CPPFLAGS += -D__LIBHUGETLBFS__ -I.
 
 ARCH = $(shell uname -m | sed -e s/i.86/i386/)
 
@@ -170,10 +170,10 @@
 libs:	$(foreach file,$(INSTALL_OBJ_LIBS),$(OBJDIRS:%=%/$(file)))
 
 # <Version handling> MOD
-$(VERSION): always
+$(VERSION): $(BUILD_BASE)/version
 	@$(VECHO) VERSION
-	$(BUILD_BASE)/localversion $(BUILD_BASE)/version $(SOURCE)
-always:
+	cp $(BUILD_BASE)/version version
+	$(BUILD_BASE)/localversion version $(SOURCE)
 # </Version handling>
 
 snapshot: $(VERSION)
@@ -237,7 +237,7 @@
 
 clean:
 	@$(VECHO) CLEAN
-	rm -f *~ *.o *.so *.a *.d *.i core a.out $(BUILD_BASE)/$(VERSION)
+	rm -f *~ *.o *.so *.a *.d *.i core a.out version $(VERSION)
 	rm -rf obj*
 	rm -f ldscripts/*~
 	rm -f libhugetlbfs-sock