Browse Source

* updates to get debian package working

peter 26 years ago
parent
commit
3d9b33b0d0
3 changed files with 3 additions and 12 deletions
  1. 2 6
      base/Makefile
  2. 1 5
      base/Makefile.fpc
  3. 0 1
      install/debian/rules

+ 2 - 6
base/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-12-23 20:20
+# Makefile generated by fpcmake v0.99.13 on 1999-12-23 21:01
 #
 #
 
 
 defaultrule: info
 defaultrule: info
@@ -151,7 +151,7 @@ ZIPTARGET=install
 # Directories
 # Directories
 
 
 ifndef FPCDIR
 ifndef FPCDIR
-FPCDIR=.
+FPCDIR=$(BASEDIR)
 endif
 endif
 ifndef PACKAGEDIR
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 PACKAGEDIR=$(FPCDIR)/packages
@@ -955,10 +955,6 @@ ide_fullgdb:
 # Install targets
 # Install targets
 #######################################
 #######################################
 
 
-base_install:
-	$(INSTALL) base/Makefile $(BASEINSTALLDIR)
-	$(INSTALL) base/makefile.fpc $(BASEINSTALLDIR)
-
 demo_install:
 demo_install:
 	$(MAKE) -C demo installdemo
 	$(MAKE) -C demo installdemo
 
 

+ 1 - 5
base/Makefile.fpc

@@ -9,7 +9,7 @@ dirs=compiler rtl utils packages fcl ide
 defaultrule=info
 defaultrule=info
 
 
 [dirs]
 [dirs]
-fpcdir=.
+fpcdir=$(BASEDIR)
 
 
 [sections]
 [sections]
 none=1
 none=1
@@ -71,10 +71,6 @@ ide_fullgdb:
 # Install targets
 # Install targets
 #######################################
 #######################################
 
 
-base_install:
-        $(INSTALL) base/Makefile $(BASEINSTALLDIR)
-        $(INSTALL) base/makefile.fpc $(BASEINSTALLDIR)
-
 demo_install:
 demo_install:
         $(MAKE) -C demo installdemo
         $(MAKE) -C demo installdemo
 
 

+ 0 - 1
install/debian/rules

@@ -96,7 +96,6 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	$(MAKE) utils_install $(INSTALLOPTS)
 	$(MAKE) utils_install $(INSTALLOPTS)
 	$(MAKE) packages install $(INSTALLOPTS)
 	$(MAKE) packages install $(INSTALLOPTS)
 
 
-	$(MAKE) base_install $(INSTALLOPTS)
 	$(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
 	$(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
 	$(MAKE) demo_install $(INSTALLOPTS)
 	$(MAKE) demo_install $(INSTALLOPTS)