btrfs-progs: do not install static binaries over non-static
authorDavid Sterba <dsterba@suse.com>
Wed, 5 Aug 2015 15:44:48 +0000 (17:44 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 31 Aug 2015 17:25:11 +0000 (19:25 +0200)
The builds should be able to coexist, so we don't want to forcibly
overwite the standard version.

Signed-off-by: David Sterba <dsterba@suse.com>
Makefile.in

index 8450ab3..25b4038 100644 (file)
@@ -344,8 +344,10 @@ install: $(libs) $(progs_install) $(INSTALLDIRS)
 
 install-static: $(progs_static) $(INSTALLDIRS)
        for p in $(progs_static) ; do \
-               $(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/`basename $$p .static` ; \
+               $(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/ ; \
        done
+       # btrfsck is a link to btrfs in the src tree, make it so for installed file as well
+       $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
 
 $(INSTALLDIRS):
        @echo "Making install in $(patsubst install-%,%,$@)"