|
Check-in Number:
|
1797 | |
| Date: |
2002-Feb-04 23:19:29 (local)
2002-Feb-04 22:19:29 (UTC) |
| User: | ms |
| Branch: | |
| Comment: |
More configuration changes, trying to fix the build.
PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from: |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/rc/.cvsignore 1.2 -> 1.3
--- .cvsignore 2002/02/04 22:03:36 1.2
+++ .cvsignore 2002/02/04 22:19:29 1.3
@@ -9,5 +9,6 @@
rc_config.h
libtool.m4
rc-sample.5
+ltmain.sh
shtool
rc.1
|
|
ossp-pkg/rc/Makefile.in 1.3 -> 1.4
--- Makefile.in 2002/02/04 21:46:00 1.3
+++ Makefile.in 2002/02/04 22:19:29 1.4
@@ -52,35 +52,40 @@
POD2MAN = pod2man
TRUE = true
-TARGET = $(TARGET_PROGS) $(TARGET_MANS) $(TARGET_TESTS)
+TARGET = $(TARGET_PROGS) $(TARGET_MANS)
TARGET_PROGS = rc
-TARGET_MANS = rc.1
-TARGET_TESTS = rc_test
+TARGET_MANS = rc.1 rc-sample.5
-PROG_OBJS = rc.o
-TST_OBJS = rc_test.o
+PROG_OBJS = rc.o rc_version.o
-SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_STR@
+SUBDIRS = @SUBDIR_EX@ @SUBDIR_VAR@ @SUBDIR_STR@ @SUBDIR_POPT@
all: $(SUBDIRS) $(TARGET)
.c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-$(TARGET_TEST): $(TST_OBJS)
- @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(TST_NAME) $(TST_OBJS) $(LIB_NAME) $(LIBS)
+$(PROG): Makefile $(OBJS) $(HDRS)
+ $(CC) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIBS)
-check: $(TARGET_TEST)
- @$(LIBTOOL) --mode=execute ./$(TST_NAME)
+rc.1: rc.pod
+ VS=`$(SHTOOL) version -lc -dshort rc_version.c`; \
+ VL=`$(SHTOOL) version -lc -dlong rc_version.c`; \
+ $(POD2MAN) --section=5 --center="OSSP Run-command processor" \
+ --release="$$VS" --date="$$VL" \
+ rc.pod >rc.1
+
+rc-sample.5: rc-sample.pod
+ VS=`$(SHTOOL) version -lc -dshort rc_version.c`; \
+ VL=`$(SHTOOL) version -lc -dlong rc_version.c`; \
+ $(POD2MAN) --section=5 --center="OSSP Run-command processor samples" \
+ --release="$$VS" --date="$$VL" \
+ rc-sample.pod >rc-sample.5
-install:
+install: all
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
-uninstall:
- -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
- -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
-
clean:
-$(RM) $(TARGET_PROG) $(PROG_OBJS)
-$(RM) $(TARGET_TST) $(TST_OBJS)
@@ -95,3 +100,5 @@
-$(RM) shtool
-$(RM) ltmain.sh libtool.m4 config.guess config.sub
+check: rc
+ @./test.sh
|
|
ossp-pkg/rc/configure.in 1.6 -> 1.7
--- configure.in 2002/02/04 21:46:00 1.6
+++ configure.in 2002/02/04 22:19:29 1.7
@@ -77,7 +77,7 @@
CFLAGS="$CFLAGS -Irc_popt"
LDFLAGS="$LDFLAGS -Lrc_popt/.libs"
LIBS_EXTRA="$LIBS_EXTRA -lpopt"])
-AC_SUBST(SUBDIR_EX)
+AC_SUBST(SUBDIR_POPT)
dnl Check for OSSP ex library
AC_CHECK_EXTLIB([OSSP ex],
|
|
