Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 174670 | Differences between
and this patch

Collapse All | Expand All

(-)pvfs2-1.5.1/Makefile.in.orig (-35 / +39 lines)
Lines 55-60 Link Here
55
prefix = @prefix@
55
prefix = @prefix@
56
mandir = @mandir@
56
mandir = @mandir@
57
exec_prefix = @exec_prefix@
57
exec_prefix = @exec_prefix@
58
sbindir = @sbindir@
59
bindir = @bindir@
60
libdir = @libdir@
61
includedir = @includedir@
58
62
59
VPATH = $(srcdir)
63
VPATH = $(srcdir)
60
SHELL = @SHELL@
64
SHELL = @SHELL@
Lines 807-854 Link Here
807
 --quiet examples/fs.conf examples/server.conf
811
 --quiet examples/fs.conf examples/server.conf
808
812
809
install_doc:
813
install_doc:
810
	install -d $(mandir)/man1
814
	install -d $(DESTDIR)$(mandir)/man1
811
	install -d $(mandir)/man5
815
	install -d $(DESTDIR)$(mandir)/man5
812
	install -m 644 $(srcdir)/doc/man/*.1 $(mandir)/man1
816
	install -m 644 $(srcdir)/doc/man/*.1 $(DESTDIR)$(mandir)/man1
813
	install -m 644 $(srcdir)/doc/man/*.5 $(mandir)/man5
817
	install -m 644 $(srcdir)/doc/man/*.5 $(DESTDIR)$(mandir)/man5
814
818
815
install:: all install_doc
819
install:: all install_doc
816
	install -d $(prefix)/include
820
	install -d $(DESTDIR)$(includedir)
817
	install -m 644 $(srcdir)/include/pvfs2.h $(prefix)/include
821
	install -m 644 $(srcdir)/include/pvfs2.h $(DESTDIR)$(includedir)
818
	install -m 644 $(srcdir)/include/pvfs2-request.h $(prefix)/include
822
	install -m 644 $(srcdir)/include/pvfs2-request.h $(DESTDIR)$(includedir)
819
	install -m 644 $(srcdir)/include/pvfs2-debug.h $(prefix)/include
823
	install -m 644 $(srcdir)/include/pvfs2-debug.h $(DESTDIR)$(includedir)
820
	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(prefix)/include
824
	install -m 644 $(srcdir)/include/pvfs2-sysint.h $(DESTDIR)$(includedir)
821
	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(prefix)/include
825
	install -m 644 $(srcdir)/include/pvfs2-mgmt.h $(DESTDIR)$(includedir)
822
	install -m 644 $(srcdir)/include/pvfs2-types.h $(prefix)/include
826
	install -m 644 $(srcdir)/include/pvfs2-types.h $(DESTDIR)$(includedir)
823
	install -m 644 $(srcdir)/include/pvfs2-util.h $(prefix)/include
827
	install -m 644 $(srcdir)/include/pvfs2-util.h $(DESTDIR)$(includedir)
824
	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(prefix)/include
828
	install -m 644 $(srcdir)/include/pvfs2-encode-stubs.h $(DESTDIR)$(includedir)
825
829
826
	install -d $(prefix)/lib
830
	install -d $(DESTDIR)$(libdir)
827
	install -m 755 $(LIBRARIES) $(prefix)/lib
831
	install -m 755 $(LIBRARIES) $(DESTDIR)$(libdir)
828
832
829
ifdef TARGET_OS_DARWIN
833
ifdef TARGET_OS_DARWIN
830
#       TOC needs to be regenerated in libs after they get moved
834
#       TOC needs to be regenerated in libs after they get moved
831
	ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
835
	ranlib $(patsubst %,$(prefix)/%,$(LIBRARIES))
832
endif
836
endif
833
837
834
	install -d $(prefix)/bin
838
	install -d $(DESTDIR)$(bindir)
835
	install -m 755 $(ADMINTOOLS) $(prefix)/bin
839
	install -m 755 $(ADMINTOOLS) $(DESTDIR)$(bindir)
836
	install -m 755 src/apps/admin/pvfs2-config $(prefix)/bin
840
	install -m 755 src/apps/admin/pvfs2-config $(DESTDIR)$(bindir)
837
	@# if we ever auto-generate genconfig, remove the $(srcdir)
841
	@# if we ever auto-generate genconfig, remove the $(srcdir)
838
	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(prefix)/bin
842
	install -m 755 $(srcdir)/src/apps/admin/pvfs2-genconfig $(DESTDIR)$(bindir)
839
ifdef BUILD_KARMA
843
ifdef BUILD_KARMA
840
	install -m 755 $(KARMA) $(prefix)/bin
844
	install -m 755 $(KARMA) $(DESTDIR)$(bindir)
841
endif
845
endif
842
846
843
	install -d $(prefix)/sbin
847
	install -d $(DESTDIR)$(sbindir)
844
848
845
ifdef BUILD_SERVER
849
ifdef BUILD_SERVER
846
	install -m 755 $(ADMINTOOLS_SERVER) $(prefix)/bin
850
	install -m 755 $(ADMINTOOLS_SERVER) $(DESTDIR)$(bindir)
847
    ifeq ($(NPTL_WORKAROUND),)
851
    ifeq ($(NPTL_WORKAROUND),)
848
	install -m 755 $(SERVER) $(prefix)/sbin
852
	install -m 755 $(SERVER) $(DESTDIR)$(sbindir)
849
    else
853
    else
850
	install -m 755 $(srcdir)/$(SERVER_STUB) $(prefix)/sbin/pvfs2-server
854
	install -m 755 $(srcdir)/$(SERVER_STUB) $(DESTDIR)$(sbindir)/pvfs2-server
851
	install -m 755 $(SERVER) $(prefix)/sbin/pvfs2-server.bin
855
	install -m 755 $(SERVER) $(DESTDIR)$(sbindir)/pvfs2-server.bin
852
    endif
856
    endif
853
endif
857
endif
854
858
Lines 864-876 Link Here
864
868
865
.PHONY: just_kmod_install
869
.PHONY: just_kmod_install
866
just_kmod_install: just_kmod
870
just_kmod_install: just_kmod
867
	install -d $(KMOD_DIR)
871
	install -d $(DESTDIR)$(KMOD_DIR)
868
	install -m 755 src/kernel/linux-2.6/pvfs2.ko $(KMOD_DIR)
872
	install -m 755 src/kernel/linux-2.6/pvfs2.ko $(DESTDIR)$(KMOD_DIR)
869
873
870
.PHONY: kmod_install
874
.PHONY: kmod_install
871
kmod_install: kmod kernapps just_kmod_install
875
kmod_install: kmod kernapps just_kmod_install
872
	install -d $(prefix)/sbin
876
	install -d $(DESTDIR)$(sbindir)
873
	install -m 755 $(KERNAPPS) $(prefix)/sbin
877
	install -m 755 $(KERNAPPS) $(DESTDIR)$(sbindir)
874
endif
878
endif
875
879
876
ifneq (,$(LINUX24_KERNEL_SRC))
880
ifneq (,$(LINUX24_KERNEL_SRC))
Lines 885-900 Link Here
885
889
886
.PHONY: just_kmod24_install
890
.PHONY: just_kmod24_install
887
just_kmod24_install: just_kmod24
891
just_kmod24_install: just_kmod24
888
	install -d $(KMOD_DIR)
892
	install -d $(DESTDIR)$(KMOD_DIR)
889
	install -m 755 src/kernel/linux-2.4/pvfs2.o $(KMOD_DIR)
893
	install -m 755 src/kernel/linux-2.4/pvfs2.o $(DESTDIR)$(KMOD_DIR)
890
894
891
.PHONY: kmod24_install
895
.PHONY: kmod24_install
892
kmod24_install: kmod24 kernapps just_kmod24_install
896
kmod24_install: kmod24 kernapps just_kmod24_install
893
	install -d $(prefix)/sbin
897
	install -d $(DESTDIR)$(sbindir)
894
	install -m 755 $(KERNAPPS) $(prefix)/sbin
898
	install -m 755 $(KERNAPPS) $(DESTDIR)$(sbindir)
895
	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(prefix)/sbin
899
	install -m 755 src/apps/kernel/linux/mount.pvfs2 $(DESTDIR)$(sbindir)
896
	@echo ""
900
	@echo ""
897
	@echo "For improved linux-2.4 support,"
901
	@echo "For improved linux-2.4 support,"
898
	@echo "install $(prefix)/sbin/mount.pvfs2 to /sbin/mount.pvfs2"
902
	@echo "install $(sbindir)/mount.pvfs2 to /sbin/mount.pvfs2"
899
	@echo ""
903
	@echo ""
900
endif
904
endif

Return to bug 174670