Author: hyc Date: Sat May 29 09:39:31 2010 New Revision: 492 Log: Tweak install vars Modified: trunk/Makefile trunk/librtmp/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat May 29 09:34:53 2010 (r491) +++ trunk/Makefile Sat May 29 09:39:31 2010 (r492) @@ -23,8 +23,13 @@ OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) LDFLAGS=-Wall $(XLDFLAGS) -BINDIR=$(DESTDIR)$(prefix)/bin -MANDIR=$(DESTDIR)$(prefix)/man +bindir=$(prefix)/bin +sbindir=$(prefix)/sbin +mandir=$(prefix)/man + +BINDIR=$(DESTDIR)$(bindir) +SBINDIR=$(DESTDIR)$(sbindir) +MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 @@ -47,8 +52,9 @@ all: $(LIBRTMP) progs progs: rtmpdump rtmpgw rtmpsrv rtmpsuck install: progs - -mkdir -p $(BINDIR) $(MANDIR)/man1 $(MANDIR)/man8 - cp rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(BINDIR) + -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 + cp rtmpdump$(EXT) $(BINDIR) + cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) cp rtmpdump.1 $(MANDIR)/man1 cp rtmpgw.8 $(MANDIR)/man8 @cd librtmp; $(MAKE) install $(MAKEFLAGS) Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Sat May 29 09:34:53 2010 (r491) +++ trunk/librtmp/Makefile Sat May 29 09:39:31 2010 (r492) @@ -21,9 +21,12 @@ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $( OPT=-O2 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) -INCDIR=$(DESTDIR)$(prefix)/include/librtmp -LIBDIR=$(DESTDIR)$(prefix)/lib -MANDIR=$(DESTDIR)$(prefix)/man +incdir=$(prefix)/include/librtmp +libdir=$(prefix)/lib +mandir=$(prefix)/man +INCDIR=$(DESTDIR)$(incdir) +LIBDIR=$(DESTDIR)$(libdir) +MANDIR=$(DESTDIR)$(mandir) all: librtmp.a